diff --git a/.env.example b/.env.example index 08a87726..55753c27 100644 --- a/.env.example +++ b/.env.example @@ -7,11 +7,6 @@ # More info in repository docs: https://github.com/wayofdev/docker-shared-services SHARED_SERVICES_NAMESPACE=${SHARED_SERVICES_NAMESPACE} -# Should be same with downloaded and configured docker-project-services -# Default: wod -# More info in repository docs: https://github.com/wayofdev/docker-project-services -PROJECT_SERVICES_NAMESPACE=${PROJECT_SERVICES_NAMESPACE} - # https://docs.docker.com/compose/reference/envvars/#compose_project_name # With custom namespace provided, it will be used to prefix all services # in Docker network for current project @@ -50,6 +45,7 @@ MEMCACHED_HOST=127.0.0.1 REDIS_HOST=127.0.0.1 REDIS_PASSWORD=null REDIS_PORT=6379 +REDIS_FORWARD_PORT=16379 MAIL_MAILER=smtp MAIL_HOST=mailpit diff --git a/.markdownlint.json b/.github/.markdownlint.json similarity index 75% rename from .markdownlint.json rename to .github/.markdownlint.json index 587ebe27..77f382df 100644 --- a/.markdownlint.json +++ b/.github/.markdownlint.json @@ -1,5 +1,5 @@ { - "$schema": "https://raw.githubusercontent.com/DavidAnson/markdownlint/v0.34.0/schema/markdownlint-config-schema.json", + "$schema": "https://raw.githubusercontent.com/DavidAnson/markdownlint/main/schema/markdownlint-config-schema.json", "line-length": false, "no-inline-html": false, "first-line-h1": false, diff --git a/.github/.release-please-config.json b/.github/.release-please-config.json index 75505c74..ebfb6a81 100644 --- a/.github/.release-please-config.json +++ b/.github/.release-please-config.json @@ -1,4 +1,5 @@ { + "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json", "release-type": "php", "packages": { ".": { diff --git a/.github/SECURITY.md b/.github/SECURITY.md index fe1b1134..d5744202 100644 --- a/.github/SECURITY.md +++ b/.github/SECURITY.md @@ -4,18 +4,6 @@ Thank you for helping keep `wayofdev/laravel-starter-tpl` and its users safe. We
-## ๐Ÿ™‹โ€โ™‚๏ธ Supported Versions - -Only certain versions of `wayofdev/laravel-starter-tpl` are currently being maintained with security updates. Please use or upgrade to one of these supported versions: - -| Version | Supported | -|---------|--------------------| -| 2.x | :white_check_mark: | - -Please ensure that you are using one of these supported versions before reporting a security issue. - -
- ## ๐Ÿšจ Reporting a Vulnerability We take all security bugs in `wayofdev/laravel-starter-tpl` seriously. Please follow the instructions below to report security vulnerabilities. diff --git a/renovate.json b/.github/renovate.json similarity index 77% rename from renovate.json rename to .github/renovate.json index 05e14fff..0e44fa82 100644 --- a/renovate.json +++ b/.github/renovate.json @@ -1,6 +1,9 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "extends": ["config:base"], + "extends": [ + "config:base", + ":semanticCommitTypeAll(deps)" + ], "prHourlyLimit": 0, "automerge": true, "platformAutomerge": true, diff --git a/.github/workflows/apply-labels.yml b/.github/workflows/apply-labels.yml index f2b6f59b..2a14666f 100644 --- a/.github/workflows/apply-labels.yml +++ b/.github/workflows/apply-labels.yml @@ -14,7 +14,7 @@ name: ๐Ÿท๏ธ Add labels jobs: label: - uses: wayofdev/gh-actions/.github/workflows/apply-labels.yml@v3.1.0 + uses: wayofdev/gh-actions/.github/workflows/apply-labels.yml@v3.1.1 with: os: ubuntu-latest secrets: diff --git a/.github/workflows/auto-merge-release.yml b/.github/workflows/auto-merge-release.yml index 97cf2374..0596ed54 100644 --- a/.github/workflows/auto-merge-release.yml +++ b/.github/workflows/auto-merge-release.yml @@ -13,7 +13,7 @@ name: ๐Ÿคž Auto merge release jobs: auto-merge: - uses: wayofdev/gh-actions/.github/workflows/auto-merge-release.yml@v3.1.0 + uses: wayofdev/gh-actions/.github/workflows/auto-merge-release.yml@v3.1.1 with: os: ubuntu-latest pull-request-number: ${{ github.event.pull_request.number }} diff --git a/.github/workflows/ci.yml.dist b/.github/workflows/ci.yml.dist deleted file mode 100644 index c6d89bb1..00000000 --- a/.github/workflows/ci.yml.dist +++ /dev/null @@ -1,101 +0,0 @@ ---- - -on: # yamllint disable-line rule:truthy - pull_request: - branches: - - master - - develop - -name: ๐Ÿ” Continuous integration - -defaults: - run: - working-directory: app - -jobs: - integration: - runs-on: ${{ matrix.os }} - strategy: - fail-fast: true - matrix: - os: ["ubuntu-22.04"] - php: ["8.2"] - - steps: - - name: ๐Ÿ“ฆ Check out the codebase - uses: actions/checkout@v4 - - - name: ๐Ÿ› ๏ธ Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ matrix.php }} - extensions: curl, mbstring, zip, fileinfo, xdebug, decimal - ini-values: error_reporting=E_ALL - tools: composer:v2 - coverage: xdebug - - - name: ๐Ÿ› ๏ธ Setup problem matchers - run: | - echo "::add-matcher::${{ runner.tool_cache }}/php.json" - echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json" - - - name: โ™ป๏ธ Restore cached backend dependencies - id: cached-composer-dependencies - uses: actions/cache@v4 - with: - path: vendor - key: vendor-${{ runner.os }}-${{ hashFiles('**/composer.lock') }}-${{ matrix.php }} - - - name: โ™ป๏ธ Restore cached .build directory - id: cached-build-dir - uses: actions/cache@v4 - with: - path: .build - key: build-${{ runner.os }}-${{ hashFiles('**/composer.lock') }}-${{ matrix.php }} - - - name: ๐Ÿ“ฅ Install backend dependencies - if: steps.cached-composer-dependencies.outputs.cache-hit != 'true' - run: composer install - - - name: ๐Ÿ› ๏ธ Prepare environment - run: | - cd ../ && make env && cd app - cp ../.env .env - mkdir -p ./.build/php-cs-fixer - mkdir -p ./.build/phpstan - mkdir -p ./.build/phpunit - env: - APP_NAME: laravel - SHARED_SERVICES_NAMESPACE: ss - PROJECT_SERVICES_NAMESPACE: wod - COMPOSE_PROJECT_NAME: laravel-starter-tpl - - - name: ๐Ÿ”‘ Generate secret application key - run: php artisan key:generate - - - name: ๐Ÿ”— Create laravel storage symlinks - run: php artisan storage:link - - - name: ๐Ÿ” Run coding standards task - run: composer run cs:diff - - - name: ๐Ÿ” Run static analysis using phpstan - run: composer run stan - env: - PHPSTAN_OUTPUT_FORMAT: github - - - name: ๐Ÿงช Execute phpunit and pest tests - run: | - composer run test:cc - env: - XDEBUG_MODE: "coverage" - - - name: ๐Ÿ“ค Upload coverage results to Codecov.io - uses: codecov/codecov-action@v4 - with: - token: ${{ secrets.CODECOV_TOKEN }} - fail_ci_if_error: true - verbose: true - files: coverage.xml - -... diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml index fb27668d..9690fd2a 100644 --- a/.github/workflows/coding-standards.yml +++ b/.github/workflows/coding-standards.yml @@ -16,6 +16,9 @@ jobs: commit-linting: timeout-minutes: 4 runs-on: ubuntu-latest + concurrency: + cancel-in-progress: true + group: commit-linting-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} permissions: contents: read pull-requests: read @@ -28,12 +31,15 @@ jobs: with: configFile: ${{ github.workspace }}/.github/.commitlint.config.mjs failOnWarnings: false - failOnErrors: false + failOnErrors: true helpURL: 'https://github.com/conventional-changelog/commitlint/#what-is-commitlint' yaml-linting: timeout-minutes: 4 runs-on: ubuntu-latest + concurrency: + cancel-in-progress: true + group: yaml-linting-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} permissions: contents: read pull-requests: read @@ -61,6 +67,7 @@ jobs: - name: ๐Ÿง Lint Markdown files uses: DavidAnson/markdownlint-cli2-action@v16.0.0 with: + config: '.github/.markdownlint.json' globs: | **/*.md !CHANGELOG.md @@ -158,7 +165,7 @@ jobs: uses: shivammathur/setup-php@2.30.4 with: php-version: ${{ matrix.php-version }} - extensions: none, ctype, dom, json, mbstring, simplexml, tokenizer, xml, xmlwriter, pdo, curl, fileinfo, pdo_mysql + extensions: none, ctype, dom, json, mbstring, simplexml, tokenizer, xml, xmlwriter, pdo, curl, fileinfo, pdo_mysql, decimal ini-values: error_reporting=E_ALL coverage: none diff --git a/.github/workflows/create-arch-diagram.yml.dist b/.github/workflows/create-arch-diagram.yml.dist index abb38a9a..7f1b1e61 100644 --- a/.github/workflows/create-arch-diagram.yml.dist +++ b/.github/workflows/create-arch-diagram.yml.dist @@ -19,7 +19,7 @@ permissions: read-all jobs: codesee: - uses: wayofdev/gh-actions/.github/workflows/create-arch-diagram.yml@master + uses: wayofdev/gh-actions/.github/workflows/create-arch-diagram.yml@v3.1.1 with: os: ubuntu-latest continue-on-error: true diff --git a/.github/workflows/dependency-analysis.yml b/.github/workflows/dependency-analysis.yml new file mode 100644 index 00000000..d8000cc4 --- /dev/null +++ b/.github/workflows/dependency-analysis.yml @@ -0,0 +1,86 @@ +--- + +on: # yamllint disable-line rule:truthy + pull_request: + branches: + - master + - develop + paths: + - 'app/config/**' + - 'app/src/**' + - 'app/tests/**' + - 'app/.php-cs-fixer.dist.php' + - 'app/composer.json' + - 'app/composer.lock' + - 'app/composer-require-checker.json' + +name: ๐Ÿ” Dependency analysis + +env: + # Disable docker support in Makefile + APP_RUNNER: 'cd app &&' + +jobs: + dependency-analysis: + timeout-minutes: 4 + runs-on: ${{ matrix.os }} + concurrency: + cancel-in-progress: true + group: dependency-analysis-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + strategy: + fail-fast: true + matrix: + os: + - ubuntu-latest + php-version: + - '8.3' + dependencies: + - locked + + steps: + - name: ๐Ÿ“ฆ Check out the codebase + uses: actions/checkout@v4.1.6 + + - name: ๐Ÿ› ๏ธ Setup PHP + uses: shivammathur/setup-php@2.30.4 + with: + php-version: ${{ matrix.php-version }} + extensions: none, ctype, dom, json, mbstring, simplexml, tokenizer, xml, xmlwriter, pdo, curl, fileinfo, pdo_mysql + ini-values: error_reporting=E_ALL + coverage: none + tools: phive + + - name: ๐Ÿ› ๏ธ Setup problem matchers + run: echo "::add-matcher::${{ runner.tool_cache }}/php.json" + + - name: ๐Ÿค– Validate composer.json and composer.lock + run: make validate-composer + + - name: ๐Ÿ” Get composer cache directory + uses: wayofdev/gh-actions/actions/composer/get-cache-directory@v3.1.1 + with: + working-directory: app + + - name: โ™ป๏ธ Restore cached dependencies installed with composer + uses: actions/cache@v4.0.2 + with: + path: ${{ env.COMPOSER_CACHE_DIR }} + key: php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('composer.lock') }} + restore-keys: php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}- + + - name: ๐Ÿ“ฅ Install "${{ matrix.dependencies }}" dependencies with composer + uses: wayofdev/gh-actions/actions/composer/install@v3.1.1 + with: + working-directory: app + dependencies: ${{ matrix.dependencies }} + + - name: ๐Ÿ“ฅ Install dependencies with phive + working-directory: app + env: + PHIVE_HOME: .phive + run: phive install --trust-gpg-keys 0xC00543248C87FB13,0x033E5F8D801A2F8D,0x47436587D82C4A39 + shell: bash + + - name: ๐Ÿ”ฌ Run maglnet/composer-require-checker + working-directory: app + run: .phive/composer-require-checker check --ansi --config-file="$(pwd)/composer-require-checker.json" --verbose diff --git a/.github/workflows/deploy-release.yml b/.github/workflows/deploy-release.yml index 8fc4e399..cdff55f5 100644 --- a/.github/workflows/deploy-release.yml +++ b/.github/workflows/deploy-release.yml @@ -51,7 +51,7 @@ jobs: run: make validate-composer - name: ๐Ÿ” Get composer cache directory - uses: wayofdev/gh-actions/actions/composer/get-cache-directory@v3.1.0 + uses: wayofdev/gh-actions/actions/composer/get-cache-directory@v3.1.1 with: working-directory: app @@ -63,7 +63,7 @@ jobs: restore-keys: php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}- - name: ๐Ÿ“ฅ Install "${{ matrix.dependencies }}" dependencies with composer - uses: wayofdev/gh-actions/actions/composer/install@v3.1.0 + uses: wayofdev/gh-actions/actions/composer/install@v3.1.1 with: working-directory: app dependencies: ${{ matrix.dependencies }} diff --git a/.github/workflows/deploy-staging.yml b/.github/workflows/deploy-staging.yml index 872fa868..f09ff96a 100644 --- a/.github/workflows/deploy-staging.yml +++ b/.github/workflows/deploy-staging.yml @@ -51,7 +51,7 @@ jobs: run: make validate-composer - name: ๐Ÿ” Get composer cache directory - uses: wayofdev/gh-actions/actions/composer/get-cache-directory@v3.1.0 + uses: wayofdev/gh-actions/actions/composer/get-cache-directory@v3.1.1 with: working-directory: app @@ -63,7 +63,7 @@ jobs: restore-keys: php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}- - name: ๐Ÿ“ฅ Install "${{ matrix.dependencies }}" dependencies with composer - uses: wayofdev/gh-actions/actions/composer/install@v3.1.0 + uses: wayofdev/gh-actions/actions/composer/install@v3.1.1 with: working-directory: app dependencies: ${{ matrix.dependencies }} diff --git a/.github/workflows/security-analysis.yml b/.github/workflows/security-analysis.yml index 2decacaa..5d66defa 100644 --- a/.github/workflows/security-analysis.yml +++ b/.github/workflows/security-analysis.yml @@ -47,7 +47,7 @@ jobs: run: make validate-composer - name: ๐Ÿ” Get composer cache directory - uses: wayofdev/gh-actions/actions/composer/get-cache-directory@v3.1.0 + uses: wayofdev/gh-actions/actions/composer/get-cache-directory@v3.1.1 with: working-directory: app @@ -59,7 +59,7 @@ jobs: restore-keys: php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}- - name: ๐Ÿ“ฅ Install "${{ matrix.dependencies }}" dependencies with composer - uses: wayofdev/gh-actions/actions/composer/install@v3.1.0 + uses: wayofdev/gh-actions/actions/composer/install@v3.1.1 with: working-directory: app dependencies: ${{ matrix.dependencies }} diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml index 32f1ca88..c8af0980 100644 --- a/.github/workflows/shellcheck.yml +++ b/.github/workflows/shellcheck.yml @@ -10,7 +10,7 @@ permissions: jobs: shellcheck: - uses: wayofdev/gh-actions/.github/workflows/shellcheck.yml@v3.1.0 + uses: wayofdev/gh-actions/.github/workflows/shellcheck.yml@v3.1.1 with: os: ubuntu-latest severity: warning diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index 9c595196..8a4eb435 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -47,7 +47,7 @@ jobs: uses: shivammathur/setup-php@2.30.4 with: php-version: ${{ matrix.php-version }} - extensions: none, ctype, dom, json, mbstring, simplexml, tokenizer, xml, xmlwriter, pdo, curl, fileinfo, pdo_mysql + extensions: none, ctype, dom, json, mbstring, simplexml, tokenizer, xml, xmlwriter, pdo, curl, fileinfo, pdo_mysql, opcache, pcntl, posix ini-values: error_reporting=E_ALL coverage: none @@ -58,7 +58,7 @@ jobs: run: make validate-composer - name: ๐Ÿ” Get composer cache directory - uses: wayofdev/gh-actions/actions/composer/get-cache-directory@v3.1.0 + uses: wayofdev/gh-actions/actions/composer/get-cache-directory@v3.1.1 with: working-directory: app @@ -70,10 +70,64 @@ jobs: restore-keys: php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}- - name: ๐Ÿ“ฅ Install "${{ matrix.dependencies }}" dependencies with composer - uses: wayofdev/gh-actions/actions/composer/install@v3.1.0 + uses: wayofdev/gh-actions/actions/composer/install@v3.1.1 with: working-directory: app dependencies: ${{ matrix.dependencies }} - name: ๐Ÿ” Run static analysis using phpstan/phpstan run: make lint-stan-ci + + psalm: + timeout-minutes: 4 + runs-on: ${{ matrix.os }} + concurrency: + cancel-in-progress: true + group: psalm-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + strategy: + fail-fast: true + matrix: + os: + - ubuntu-latest + php-version: + - '8.3' + dependencies: + - locked + steps: + - name: ๐Ÿ“ฆ Check out the codebase + uses: actions/checkout@v4.1.6 + + - name: ๐Ÿ› ๏ธ Setup PHP + uses: shivammathur/setup-php@2.30.4 + with: + php-version: ${{ matrix.php-version }} + extensions: none, ctype, dom, json, mbstring, simplexml, tokenizer, xml, xmlwriter, pdo, pdo_mysql, curl, fileinfo, opcache, pcntl, posix + ini-values: error_reporting=E_ALL + coverage: none + + - name: ๐Ÿ› ๏ธ Setup problem matchers + run: echo "::add-matcher::${{ runner.tool_cache }}/php.json" + + - name: ๐Ÿค– Validate composer.json and composer.lock + run: make validate-composer + + - name: ๐Ÿ” Get composer cache directory + uses: wayofdev/gh-actions/actions/composer/get-cache-directory@v3.1.1 + with: + working-directory: app + + - name: โ™ป๏ธ Restore cached dependencies installed with composer + uses: actions/cache@v4.0.2 + with: + path: ${{ env.COMPOSER_CACHE_DIR }} + key: php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('composer.lock') }} + restore-keys: php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}- + + - name: ๐Ÿ“ฅ Install "${{ matrix.dependencies }}" dependencies with composer + uses: wayofdev/gh-actions/actions/composer/install@v3.1.1 + with: + working-directory: app + dependencies: ${{ matrix.dependencies }} + + - name: ๐Ÿ” Run static analysis using vimeo/psalm + run: make lint-psalm-ci diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml new file mode 100644 index 00000000..5a616e97 --- /dev/null +++ b/.github/workflows/testing.yml @@ -0,0 +1,91 @@ +--- + +on: # yamllint disable-line rule:truthy + pull_request: + branches: + - master + - develop + +name: ๐Ÿงช Testing (SQLite) + +env: + # Disable docker support in Makefile + APP_RUNNER: 'cd app &&' + +jobs: + code-coverage: + timeout-minutes: 4 + runs-on: ${{ matrix.os }} + concurrency: + cancel-in-progress: true + group: code-coverage-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-${{ matrix.php-version }}-${{ matrix.dependencies }} + strategy: + fail-fast: true + matrix: + os: + - ubuntu-latest + php-version: + - '8.3' + dependencies: + - locked + steps: + - name: ๐Ÿ“ฆ Check out the codebase + uses: actions/checkout@v4.1.6 + + - name: ๐Ÿ› ๏ธ Setup PHP + uses: shivammathur/setup-php@2.30.4 + with: + php-version: ${{ matrix.php-version }} + extensions: none, ctype, dom, json, mbstring, simplexml, tokenizer, xml, xmlwriter, pdo, pdo_mysql, pdo_sqlite, curl, fileinfo, opcache, pcntl, posix + ini-values: error_reporting=E_ALL + coverage: xdebug + + - name: ๐Ÿ› ๏ธ Setup problem matchers + run: | + echo "::add-matcher::${{ runner.tool_cache }}/php.json" + echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json" + + - name: ๐Ÿค– Validate composer.json and composer.lock + run: make validate-composer + + - name: ๐Ÿ” Get composer cache directory + uses: wayofdev/gh-actions/actions/composer/get-cache-directory@v3.1.0 + with: + working-directory: app + + - name: โ™ป๏ธ Restore cached dependencies installed with composer + uses: actions/cache@v4.0.2 + with: + path: ${{ env.COMPOSER_CACHE_DIR }} + key: php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('composer.lock') }} + restore-keys: php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}- + + - name: ๐Ÿ“ฅ Install "${{ matrix.dependencies }}" dependencies with composer + uses: wayofdev/gh-actions/actions/composer/install@v3.1.0 + with: + working-directory: app + dependencies: ${{ matrix.dependencies }} + + - name: ๐Ÿ› ๏ธ Prepare environment + run: | + make env + cp -rf .env app/.env + env: + APP_NAME: laravel + SHARED_SERVICES_NAMESPACE: ss + COMPOSE_PROJECT_NAME: laravel-starter-tpl + + - name: ๐Ÿ”‘ Generate secret application key + working-directory: app + run: php artisan key:generate + + - name: ๐Ÿงช Collect code coverage with Xdebug and pestphp/pest + working-directory: app + run: composer test:cc + + - name: ๐Ÿ“ค Upload code coverage report to Codecov + uses: codecov/codecov-action@v4.4.1 + with: + files: app/.build/phpunit/logs/clover.xml + token: ${{ secrets.CODECOV_TOKEN }} + verbose: true diff --git a/Makefile b/Makefile index daa939dc..2534c275 100644 --- a/Makefile +++ b/Makefile @@ -22,7 +22,6 @@ BUILDER_PARAMS ?= docker run --rm -i \ --env-file ./.env \ --env APP_NAME=$(APP_NAME) \ --env SHARED_SERVICES_NAMESPACE=$(SHARED_SERVICES_NAMESPACE) \ - --env PROJECT_SERVICES_NAMESPACE=$(PROJECT_SERVICES_NAMESPACE) \ --env COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME) \ --env COMPOSER_AUTH="$(COMPOSER_AUTH)" @@ -51,14 +50,14 @@ ACTION_LINT_RUNNER ?= $(DOCKER) run --rm $$(tty -s && echo "-it" || echo) \ MARKDOWN_LINT_RUNNER ?= $(DOCKER) run --rm $$(tty -s && echo "-it" || echo) \ -v $(shell pwd):/app \ --workdir /app \ - davidanson/markdownlint-cli2-rules:latest + davidanson/markdownlint-cli2-rules:latest \ + --config ".github/.markdownlint.json" PHIVE_RUNNER ?= $(DOCKER_COMPOSE) run --rm --no-deps app EXPORT_VARS = '\ $${APP_NAME} \ $${COMPOSE_PROJECT_NAME} \ - $${PROJECT_SERVICES_NAMESPACE} \ $${SHARED_SERVICES_NAMESPACE} \ $${COMPOSER_AUTH}' @@ -295,7 +294,7 @@ lint-audit: ## Runs security checks for composer dependencies .PHONY: lint-security validate-composer: ## Validates composer.json and composer.lock files - $(APP_COMPOSER) validate + $(APP_COMPOSER) validate --ansi --strict .PHONY: validate-composer # diff --git a/README.md b/README.md index f5a79427..a476ea34 100644 --- a/README.md +++ b/README.md @@ -99,7 +99,6 @@ To use this repository, you need to meet the following requirements: $ make env \ APP_NAME=laravel \ SHARED_SERVICES_NAMESPACE=ss \ - PROJECT_SERVICES_NAMESPACE=wod \ COMPOSE_PROJECT_NAME=laravel-starter-tpl ``` @@ -111,7 +110,6 @@ To use this repository, you need to meet the following requirements: $ make env \ APP_NAME=laravel \ SHARED_SERVICES_NAMESPACE=ss \ - PROJECT_SERVICES_NAMESPACE=wod \ COMPOSE_PROJECT_NAME=laravel-starter-tpl \ FORCE=true ``` diff --git a/app/bootstrap/app.php b/app/bootstrap/app.php index a4241bfb..80092013 100644 --- a/app/bootstrap/app.php +++ b/app/bootstrap/app.php @@ -11,7 +11,7 @@ | */ -$app = (new Laravel\Application( +$app = (new Bridge\Laravel\Application( $_ENV['APP_BASE_PATH'] ?? dirname(__DIR__) )); @@ -28,17 +28,17 @@ $app->singleton( Illuminate\Contracts\Http\Kernel::class, - Laravel\HttpKernel::class + Bridge\Laravel\HttpKernel::class ); $app->singleton( Illuminate\Contracts\Console\Kernel::class, - Laravel\ConsoleKernel::class + Bridge\Laravel\ConsoleKernel::class ); $app->singleton( Illuminate\Contracts\Debug\ExceptionHandler::class, - Laravel\Exceptions\Handler::class + Bridge\Laravel\Exceptions\Handler::class ); /* diff --git a/app/composer.json b/app/composer.json index 5253d92b..4e6e1ec1 100644 --- a/app/composer.json +++ b/app/composer.json @@ -70,10 +70,10 @@ "prefer-stable": true, "autoload": { "psr-4": { + "Bridge\\Laravel\\": "src/Bridge/Laravel/", "Database\\Factories\\": "database/factories/", "Database\\Seeders\\": "database/seeders/", "Domain\\": "src/Domain/", - "Laravel\\": "src/Bridge/Laravel/", "Support\\": "src/Support/" } }, @@ -146,10 +146,12 @@ "stan:ci": "php vendor/bin/phpstan analyse --memory-limit=2G --error-format=github", "test": [ "@putenv XDEBUG_MODE=coverage", + "@putenv DB_CONNECTION=memory", "php vendor/bin/pest --color=always" ], "test:cc": [ "@putenv XDEBUG_MODE=coverage", + "@putenv DB_CONNECTION=memory", "php vendor/bin/pest --coverage --coverage-clover=.build/phpunit/logs/clover.xml --color=always" ] } diff --git a/app/composer.lock b/app/composer.lock index 1772ad05..fbb03c31 100644 --- a/app/composer.lock +++ b/app/composer.lock @@ -1154,16 +1154,16 @@ }, { "name": "laravel/framework", - "version": "v11.9.1", + "version": "v11.10.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "60167ce91c59ed5eea2ad4f2a7b6d686fb103ba7" + "reference": "99b4255194912044b75ab72329f8c19e6345720e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/60167ce91c59ed5eea2ad4f2a7b6d686fb103ba7", - "reference": "60167ce91c59ed5eea2ad4f2a7b6d686fb103ba7", + "url": "https://api.github.com/repos/laravel/framework/zipball/99b4255194912044b75ab72329f8c19e6345720e", + "reference": "99b4255194912044b75ab72329f8c19e6345720e", "shasum": "" }, "require": { @@ -1355,7 +1355,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2024-05-28T18:16:41+00:00" + "time": "2024-06-04T13:45:55+00:00" }, { "name": "laravel/prompts", @@ -2090,16 +2090,16 @@ }, { "name": "nesbot/carbon", - "version": "3.4.0", + "version": "3.5.0", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "8eab8983c83c30e0bacbef8d311e3f3b8172727f" + "reference": "415782b7e48223342f1a616c16c45a95b15b2318" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/8eab8983c83c30e0bacbef8d311e3f3b8172727f", - "reference": "8eab8983c83c30e0bacbef8d311e3f3b8172727f", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/415782b7e48223342f1a616c16c45a95b15b2318", + "reference": "415782b7e48223342f1a616c16c45a95b15b2318", "shasum": "" }, "require": { @@ -2117,13 +2117,13 @@ "require-dev": { "doctrine/dbal": "^3.6.3 || ^4.0", "doctrine/orm": "^2.15.2 || ^3.0", - "friendsofphp/php-cs-fixer": "^3.52.1", + "friendsofphp/php-cs-fixer": "^3.57.2", "kylekatarnls/multi-tester": "^2.5.3", "ondrejmirtes/better-reflection": "^6.25.0.4", "phpmd/phpmd": "^2.15.0", "phpstan/extension-installer": "^1.3.1", - "phpstan/phpstan": "^1.10.65", - "phpunit/phpunit": "^10.5.15", + "phpstan/phpstan": "^1.11.2", + "phpunit/phpunit": "^10.5.20", "squizlabs/php_codesniffer": "^3.9.0" }, "bin": [ @@ -2192,7 +2192,7 @@ "type": "tidelift" } ], - "time": "2024-05-24T14:26:34+00:00" + "time": "2024-06-03T17:25:54+00:00" }, { "name": "nette/schema", @@ -3053,16 +3053,16 @@ }, { "name": "psy/psysh", - "version": "v0.12.3", + "version": "v0.12.4", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "b6b6cce7d3ee8fbf31843edce5e8f5a72eff4a73" + "reference": "2fd717afa05341b4f8152547f142cd2f130f6818" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/b6b6cce7d3ee8fbf31843edce5e8f5a72eff4a73", - "reference": "b6b6cce7d3ee8fbf31843edce5e8f5a72eff4a73", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/2fd717afa05341b4f8152547f142cd2f130f6818", + "reference": "2fd717afa05341b4f8152547f142cd2f130f6818", "shasum": "" }, "require": { @@ -3126,9 +3126,9 @@ ], "support": { "issues": "https://github.com/bobthecow/psysh/issues", - "source": "https://github.com/bobthecow/psysh/tree/v0.12.3" + "source": "https://github.com/bobthecow/psysh/tree/v0.12.4" }, - "time": "2024-04-02T15:57:53+00:00" + "time": "2024-06-10T01:18:23+00:00" }, { "name": "ralouphie/getallheaders", @@ -3357,16 +3357,16 @@ }, { "name": "sentry/sentry", - "version": "4.7.0", + "version": "4.8.0", "source": { "type": "git", "url": "https://github.com/getsentry/sentry-php.git", - "reference": "d6769b2a5e6bf19ed3bbfbf52328ceaf8e6fcb1f" + "reference": "3cf5778ff425a23f2d22ed41b423691d36f47163" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/getsentry/sentry-php/zipball/d6769b2a5e6bf19ed3bbfbf52328ceaf8e6fcb1f", - "reference": "d6769b2a5e6bf19ed3bbfbf52328ceaf8e6fcb1f", + "url": "https://api.github.com/repos/getsentry/sentry-php/zipball/3cf5778ff425a23f2d22ed41b423691d36f47163", + "reference": "3cf5778ff425a23f2d22ed41b423691d36f47163", "shasum": "" }, "require": { @@ -3430,7 +3430,7 @@ ], "support": { "issues": "https://github.com/getsentry/sentry-php/issues", - "source": "https://github.com/getsentry/sentry-php/tree/4.7.0" + "source": "https://github.com/getsentry/sentry-php/tree/4.8.0" }, "funding": [ { @@ -3442,7 +3442,7 @@ "type": "custom" } ], - "time": "2024-04-10T13:22:13+00:00" + "time": "2024-06-05T13:18:43+00:00" }, { "name": "sentry/sentry-laravel", @@ -3596,16 +3596,16 @@ }, { "name": "spatie/laravel-fractal", - "version": "6.2.0", + "version": "6.2.1", "source": { "type": "git", "url": "https://github.com/spatie/laravel-fractal.git", - "reference": "5b6a17720fc77891e79f505dde8368ea8e71fb13" + "reference": "0a30630d2ab49590af118172c03c99c0d838dab1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-fractal/zipball/5b6a17720fc77891e79f505dde8368ea8e71fb13", - "reference": "5b6a17720fc77891e79f505dde8368ea8e71fb13", + "url": "https://api.github.com/repos/spatie/laravel-fractal/zipball/0a30630d2ab49590af118172c03c99c0d838dab1", + "reference": "0a30630d2ab49590af118172c03c99c0d838dab1", "shasum": "" }, "require": { @@ -3665,7 +3665,7 @@ "transform" ], "support": { - "source": "https://github.com/spatie/laravel-fractal/tree/6.2.0" + "source": "https://github.com/spatie/laravel-fractal/tree/6.2.1" }, "funding": [ { @@ -3673,7 +3673,7 @@ "type": "custom" } ], - "time": "2024-03-18T12:38:19+00:00" + "time": "2024-06-04T09:33:08+00:00" }, { "name": "spatie/laravel-package-tools", @@ -3882,16 +3882,16 @@ }, { "name": "symfony/clock", - "version": "v7.0.7", + "version": "v7.1.1", "source": { "type": "git", "url": "https://github.com/symfony/clock.git", - "reference": "2008671acb4a30b01c453de193cf9c80549ebda6" + "reference": "3dfc8b084853586de51dd1441c6242c76a28cbe7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/clock/zipball/2008671acb4a30b01c453de193cf9c80549ebda6", - "reference": "2008671acb4a30b01c453de193cf9c80549ebda6", + "url": "https://api.github.com/repos/symfony/clock/zipball/3dfc8b084853586de51dd1441c6242c76a28cbe7", + "reference": "3dfc8b084853586de51dd1441c6242c76a28cbe7", "shasum": "" }, "require": { @@ -3936,7 +3936,7 @@ "time" ], "support": { - "source": "https://github.com/symfony/clock/tree/v7.0.7" + "source": "https://github.com/symfony/clock/tree/v7.1.1" }, "funding": [ { @@ -3952,20 +3952,20 @@ "type": "tidelift" } ], - "time": "2024-04-18T09:29:19+00:00" + "time": "2024-05-31T14:57:53+00:00" }, { "name": "symfony/console", - "version": "v7.0.7", + "version": "v7.1.1", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "c981e0e9380ce9f146416bde3150c79197ce9986" + "reference": "9b008f2d7b21c74ef4d0c3de6077a642bc55ece3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/c981e0e9380ce9f146416bde3150c79197ce9986", - "reference": "c981e0e9380ce9f146416bde3150c79197ce9986", + "url": "https://api.github.com/repos/symfony/console/zipball/9b008f2d7b21c74ef4d0c3de6077a642bc55ece3", + "reference": "9b008f2d7b21c74ef4d0c3de6077a642bc55ece3", "shasum": "" }, "require": { @@ -4029,7 +4029,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v7.0.7" + "source": "https://github.com/symfony/console/tree/v7.1.1" }, "funding": [ { @@ -4045,20 +4045,20 @@ "type": "tidelift" } ], - "time": "2024-04-18T09:29:19+00:00" + "time": "2024-05-31T14:57:53+00:00" }, { "name": "symfony/css-selector", - "version": "v7.0.7", + "version": "v7.1.1", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "b08a4ad89e84b29cec285b7b1f781a7ae51cf4bc" + "reference": "1c7cee86c6f812896af54434f8ce29c8d94f9ff4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/b08a4ad89e84b29cec285b7b1f781a7ae51cf4bc", - "reference": "b08a4ad89e84b29cec285b7b1f781a7ae51cf4bc", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/1c7cee86c6f812896af54434f8ce29c8d94f9ff4", + "reference": "1c7cee86c6f812896af54434f8ce29c8d94f9ff4", "shasum": "" }, "require": { @@ -4094,7 +4094,7 @@ "description": "Converts CSS selectors to XPath expressions", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/css-selector/tree/v7.0.7" + "source": "https://github.com/symfony/css-selector/tree/v7.1.1" }, "funding": [ { @@ -4110,7 +4110,7 @@ "type": "tidelift" } ], - "time": "2024-04-18T09:29:19+00:00" + "time": "2024-05-31T14:57:53+00:00" }, { "name": "symfony/deprecation-contracts", @@ -4181,16 +4181,16 @@ }, { "name": "symfony/error-handler", - "version": "v7.0.7", + "version": "v7.1.1", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "cf97429887e40480c847bfeb6c3991e1e2c086ab" + "reference": "e9b8bbce0b4f322939332ab7b6b81d8c11da27dd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/cf97429887e40480c847bfeb6c3991e1e2c086ab", - "reference": "cf97429887e40480c847bfeb6c3991e1e2c086ab", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/e9b8bbce0b4f322939332ab7b6b81d8c11da27dd", + "reference": "e9b8bbce0b4f322939332ab7b6b81d8c11da27dd", "shasum": "" }, "require": { @@ -4236,7 +4236,7 @@ "description": "Provides tools to manage errors and ease debugging PHP code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/error-handler/tree/v7.0.7" + "source": "https://github.com/symfony/error-handler/tree/v7.1.1" }, "funding": [ { @@ -4252,20 +4252,20 @@ "type": "tidelift" } ], - "time": "2024-04-18T09:29:19+00:00" + "time": "2024-05-31T14:57:53+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v7.0.7", + "version": "v7.1.1", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "db2a7fab994d67d92356bb39c367db115d9d30f9" + "reference": "9fa7f7a21beb22a39a8f3f28618b29e50d7a55a7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/db2a7fab994d67d92356bb39c367db115d9d30f9", - "reference": "db2a7fab994d67d92356bb39c367db115d9d30f9", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/9fa7f7a21beb22a39a8f3f28618b29e50d7a55a7", + "reference": "9fa7f7a21beb22a39a8f3f28618b29e50d7a55a7", "shasum": "" }, "require": { @@ -4316,7 +4316,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v7.0.7" + "source": "https://github.com/symfony/event-dispatcher/tree/v7.1.1" }, "funding": [ { @@ -4332,7 +4332,7 @@ "type": "tidelift" } ], - "time": "2024-04-18T09:29:19+00:00" + "time": "2024-05-31T14:57:53+00:00" }, { "name": "symfony/event-dispatcher-contracts", @@ -4412,16 +4412,16 @@ }, { "name": "symfony/finder", - "version": "v7.0.7", + "version": "v7.1.1", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "4d58f0f4fe95a30d7b538d71197135483560b97c" + "reference": "fbb0ba67688b780efbc886c1a0a0948dcf7205d6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/4d58f0f4fe95a30d7b538d71197135483560b97c", - "reference": "4d58f0f4fe95a30d7b538d71197135483560b97c", + "url": "https://api.github.com/repos/symfony/finder/zipball/fbb0ba67688b780efbc886c1a0a0948dcf7205d6", + "reference": "fbb0ba67688b780efbc886c1a0a0948dcf7205d6", "shasum": "" }, "require": { @@ -4456,7 +4456,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v7.0.7" + "source": "https://github.com/symfony/finder/tree/v7.1.1" }, "funding": [ { @@ -4472,20 +4472,20 @@ "type": "tidelift" } ], - "time": "2024-04-28T11:44:19+00:00" + "time": "2024-05-31T14:57:53+00:00" }, { "name": "symfony/http-foundation", - "version": "v7.0.7", + "version": "v7.1.1", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "0194e064b8bdc29381462f790bab04e1cac8fdc8" + "reference": "74d171d5b6a1d9e4bfee09a41937c17a7536acfa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/0194e064b8bdc29381462f790bab04e1cac8fdc8", - "reference": "0194e064b8bdc29381462f790bab04e1cac8fdc8", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/74d171d5b6a1d9e4bfee09a41937c17a7536acfa", + "reference": "74d171d5b6a1d9e4bfee09a41937c17a7536acfa", "shasum": "" }, "require": { @@ -4533,7 +4533,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v7.0.7" + "source": "https://github.com/symfony/http-foundation/tree/v7.1.1" }, "funding": [ { @@ -4549,25 +4549,26 @@ "type": "tidelift" } ], - "time": "2024-04-18T09:29:19+00:00" + "time": "2024-05-31T14:57:53+00:00" }, { "name": "symfony/http-kernel", - "version": "v7.0.7", + "version": "v7.1.1", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "e07bb9bd86e7cd8ba2d3d9c618eec9d1bbe06d25" + "reference": "fa8d1c75b5f33b1302afccf81811f93976c6e26f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/e07bb9bd86e7cd8ba2d3d9c618eec9d1bbe06d25", - "reference": "e07bb9bd86e7cd8ba2d3d9c618eec9d1bbe06d25", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/fa8d1c75b5f33b1302afccf81811f93976c6e26f", + "reference": "fa8d1c75b5f33b1302afccf81811f93976c6e26f", "shasum": "" }, "require": { "php": ">=8.2", "psr/log": "^1|^2|^3", + "symfony/deprecation-contracts": "^2.5|^3", "symfony/error-handler": "^6.4|^7.0", "symfony/event-dispatcher": "^6.4|^7.0", "symfony/http-foundation": "^6.4|^7.0", @@ -4608,9 +4609,9 @@ "symfony/finder": "^6.4|^7.0", "symfony/http-client-contracts": "^2.5|^3", "symfony/process": "^6.4|^7.0", - "symfony/property-access": "^6.4|^7.0", + "symfony/property-access": "^7.1", "symfony/routing": "^6.4|^7.0", - "symfony/serializer": "^6.4.4|^7.0.4", + "symfony/serializer": "^7.1", "symfony/stopwatch": "^6.4|^7.0", "symfony/translation": "^6.4|^7.0", "symfony/translation-contracts": "^2.5|^3", @@ -4646,7 +4647,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v7.0.7" + "source": "https://github.com/symfony/http-kernel/tree/v7.1.1" }, "funding": [ { @@ -4662,20 +4663,20 @@ "type": "tidelift" } ], - "time": "2024-04-29T12:20:25+00:00" + "time": "2024-06-04T06:52:15+00:00" }, { "name": "symfony/mailer", - "version": "v7.0.7", + "version": "v7.1.1", "source": { "type": "git", "url": "https://github.com/symfony/mailer.git", - "reference": "4ff41a7c7998a88cfdc31b5841ef64d9246fc56a" + "reference": "2eaad2e167cae930f25a3d731fec8b2ded5e751e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mailer/zipball/4ff41a7c7998a88cfdc31b5841ef64d9246fc56a", - "reference": "4ff41a7c7998a88cfdc31b5841ef64d9246fc56a", + "url": "https://api.github.com/repos/symfony/mailer/zipball/2eaad2e167cae930f25a3d731fec8b2ded5e751e", + "reference": "2eaad2e167cae930f25a3d731fec8b2ded5e751e", "shasum": "" }, "require": { @@ -4726,7 +4727,7 @@ "description": "Helps sending emails", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/mailer/tree/v7.0.7" + "source": "https://github.com/symfony/mailer/tree/v7.1.1" }, "funding": [ { @@ -4742,20 +4743,20 @@ "type": "tidelift" } ], - "time": "2024-04-18T09:29:19+00:00" + "time": "2024-05-31T14:57:53+00:00" }, { "name": "symfony/mime", - "version": "v7.0.7", + "version": "v7.1.1", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "3adbf110c306546f6f00337f421d2edca0e8d3c0" + "reference": "21027eaacc1a8a20f5e616c25c3580f5dd3a15df" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/3adbf110c306546f6f00337f421d2edca0e8d3c0", - "reference": "3adbf110c306546f6f00337f421d2edca0e8d3c0", + "url": "https://api.github.com/repos/symfony/mime/zipball/21027eaacc1a8a20f5e616c25c3580f5dd3a15df", + "reference": "21027eaacc1a8a20f5e616c25c3580f5dd3a15df", "shasum": "" }, "require": { @@ -4768,7 +4769,7 @@ "phpdocumentor/reflection-docblock": "<3.2.2", "phpdocumentor/type-resolver": "<1.4.0", "symfony/mailer": "<6.4", - "symfony/serializer": "<6.4" + "symfony/serializer": "<6.4.3|>7.0,<7.0.3" }, "require-dev": { "egulias/email-validator": "^2.1.10|^3.1|^4", @@ -4778,7 +4779,7 @@ "symfony/process": "^6.4|^7.0", "symfony/property-access": "^6.4|^7.0", "symfony/property-info": "^6.4|^7.0", - "symfony/serializer": "^6.4|^7.0" + "symfony/serializer": "^6.4.3|^7.0.3" }, "type": "library", "autoload": { @@ -4810,7 +4811,7 @@ "mime-type" ], "support": { - "source": "https://github.com/symfony/mime/tree/v7.0.7" + "source": "https://github.com/symfony/mime/tree/v7.1.1" }, "funding": [ { @@ -4826,20 +4827,20 @@ "type": "tidelift" } ], - "time": "2024-04-18T09:29:19+00:00" + "time": "2024-06-04T06:40:14+00:00" }, { "name": "symfony/options-resolver", - "version": "v7.0.7", + "version": "v7.1.1", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", - "reference": "23cc173858776ad451e31f053b1c9f47840b2cfa" + "reference": "47aa818121ed3950acd2b58d1d37d08a94f9bf55" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/23cc173858776ad451e31f053b1c9f47840b2cfa", - "reference": "23cc173858776ad451e31f053b1c9f47840b2cfa", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/47aa818121ed3950acd2b58d1d37d08a94f9bf55", + "reference": "47aa818121ed3950acd2b58d1d37d08a94f9bf55", "shasum": "" }, "require": { @@ -4877,7 +4878,7 @@ "options" ], "support": { - "source": "https://github.com/symfony/options-resolver/tree/v7.0.7" + "source": "https://github.com/symfony/options-resolver/tree/v7.1.1" }, "funding": [ { @@ -4893,7 +4894,7 @@ "type": "tidelift" } ], - "time": "2024-04-18T09:29:19+00:00" + "time": "2024-05-31T14:57:53+00:00" }, { "name": "symfony/polyfill-ctype", @@ -5608,16 +5609,16 @@ }, { "name": "symfony/process", - "version": "v7.0.7", + "version": "v7.1.1", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "3839e56b94dd1dbd13235d27504e66baf23faba0" + "reference": "febf90124323a093c7ee06fdb30e765ca3c20028" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/3839e56b94dd1dbd13235d27504e66baf23faba0", - "reference": "3839e56b94dd1dbd13235d27504e66baf23faba0", + "url": "https://api.github.com/repos/symfony/process/zipball/febf90124323a093c7ee06fdb30e765ca3c20028", + "reference": "febf90124323a093c7ee06fdb30e765ca3c20028", "shasum": "" }, "require": { @@ -5649,7 +5650,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v7.0.7" + "source": "https://github.com/symfony/process/tree/v7.1.1" }, "funding": [ { @@ -5665,20 +5666,20 @@ "type": "tidelift" } ], - "time": "2024-04-18T09:29:19+00:00" + "time": "2024-05-31T14:57:53+00:00" }, { "name": "symfony/psr-http-message-bridge", - "version": "v7.0.7", + "version": "v7.1.1", "source": { "type": "git", "url": "https://github.com/symfony/psr-http-message-bridge.git", - "reference": "727befd41438a8feb64066871d3656d8cbdcdbe2" + "reference": "9a5dbb606da711f5d40a7596ad577856f9402140" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/727befd41438a8feb64066871d3656d8cbdcdbe2", - "reference": "727befd41438a8feb64066871d3656d8cbdcdbe2", + "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/9a5dbb606da711f5d40a7596ad577856f9402140", + "reference": "9a5dbb606da711f5d40a7596ad577856f9402140", "shasum": "" }, "require": { @@ -5732,7 +5733,7 @@ "psr-7" ], "support": { - "source": "https://github.com/symfony/psr-http-message-bridge/tree/v7.0.7" + "source": "https://github.com/symfony/psr-http-message-bridge/tree/v7.1.1" }, "funding": [ { @@ -5748,20 +5749,20 @@ "type": "tidelift" } ], - "time": "2024-04-18T09:29:19+00:00" + "time": "2024-05-31T14:57:53+00:00" }, { "name": "symfony/routing", - "version": "v7.0.7", + "version": "v7.1.1", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "9f82bf7766ccc9c22ab7aeb9bebb98351483fa5b" + "reference": "60c31bab5c45af7f13091b87deb708830f3c96c0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/9f82bf7766ccc9c22ab7aeb9bebb98351483fa5b", - "reference": "9f82bf7766ccc9c22ab7aeb9bebb98351483fa5b", + "url": "https://api.github.com/repos/symfony/routing/zipball/60c31bab5c45af7f13091b87deb708830f3c96c0", + "reference": "60c31bab5c45af7f13091b87deb708830f3c96c0", "shasum": "" }, "require": { @@ -5813,7 +5814,7 @@ "url" ], "support": { - "source": "https://github.com/symfony/routing/tree/v7.0.7" + "source": "https://github.com/symfony/routing/tree/v7.1.1" }, "funding": [ { @@ -5829,7 +5830,7 @@ "type": "tidelift" } ], - "time": "2024-04-18T09:29:19+00:00" + "time": "2024-05-31T14:57:53+00:00" }, { "name": "symfony/service-contracts", @@ -5916,16 +5917,16 @@ }, { "name": "symfony/string", - "version": "v7.0.7", + "version": "v7.1.1", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "e405b5424dc2528e02e31ba26b83a79fd4eb8f63" + "reference": "60bc311c74e0af215101235aa6f471bcbc032df2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/e405b5424dc2528e02e31ba26b83a79fd4eb8f63", - "reference": "e405b5424dc2528e02e31ba26b83a79fd4eb8f63", + "url": "https://api.github.com/repos/symfony/string/zipball/60bc311c74e0af215101235aa6f471bcbc032df2", + "reference": "60bc311c74e0af215101235aa6f471bcbc032df2", "shasum": "" }, "require": { @@ -5939,6 +5940,7 @@ "symfony/translation-contracts": "<2.5" }, "require-dev": { + "symfony/emoji": "^7.1", "symfony/error-handler": "^6.4|^7.0", "symfony/http-client": "^6.4|^7.0", "symfony/intl": "^6.4|^7.0", @@ -5982,7 +5984,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v7.0.7" + "source": "https://github.com/symfony/string/tree/v7.1.1" }, "funding": [ { @@ -5998,20 +6000,20 @@ "type": "tidelift" } ], - "time": "2024-04-18T09:29:19+00:00" + "time": "2024-06-04T06:40:14+00:00" }, { "name": "symfony/translation", - "version": "v7.0.7", + "version": "v7.1.1", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "1515e03afaa93e6419aba5d5c9d209159317100b" + "reference": "cf5ae136e124fc7681b34ce9fac9d5b9ae8ceee3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/1515e03afaa93e6419aba5d5c9d209159317100b", - "reference": "1515e03afaa93e6419aba5d5c9d209159317100b", + "url": "https://api.github.com/repos/symfony/translation/zipball/cf5ae136e124fc7681b34ce9fac9d5b9ae8ceee3", + "reference": "cf5ae136e124fc7681b34ce9fac9d5b9ae8ceee3", "shasum": "" }, "require": { @@ -6076,7 +6078,7 @@ "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/translation/tree/v7.0.7" + "source": "https://github.com/symfony/translation/tree/v7.1.1" }, "funding": [ { @@ -6092,7 +6094,7 @@ "type": "tidelift" } ], - "time": "2024-04-18T09:29:19+00:00" + "time": "2024-05-31T14:57:53+00:00" }, { "name": "symfony/translation-contracts", @@ -6174,16 +6176,16 @@ }, { "name": "symfony/uid", - "version": "v7.0.7", + "version": "v7.1.1", "source": { "type": "git", "url": "https://github.com/symfony/uid.git", - "reference": "4f3a5d181999e25918586c8369de09e7814e7be2" + "reference": "bb59febeecc81528ff672fad5dab7f06db8c8277" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/uid/zipball/4f3a5d181999e25918586c8369de09e7814e7be2", - "reference": "4f3a5d181999e25918586c8369de09e7814e7be2", + "url": "https://api.github.com/repos/symfony/uid/zipball/bb59febeecc81528ff672fad5dab7f06db8c8277", + "reference": "bb59febeecc81528ff672fad5dab7f06db8c8277", "shasum": "" }, "require": { @@ -6228,7 +6230,7 @@ "uuid" ], "support": { - "source": "https://github.com/symfony/uid/tree/v7.0.7" + "source": "https://github.com/symfony/uid/tree/v7.1.1" }, "funding": [ { @@ -6244,20 +6246,20 @@ "type": "tidelift" } ], - "time": "2024-04-18T09:29:19+00:00" + "time": "2024-05-31T14:57:53+00:00" }, { "name": "symfony/var-dumper", - "version": "v7.0.7", + "version": "v7.1.1", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "d1627b66fd87c8b4d90cabe5671c29d575690924" + "reference": "deb2c2b506ff6fdbb340e00b34e9901e1605f293" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/d1627b66fd87c8b4d90cabe5671c29d575690924", - "reference": "d1627b66fd87c8b4d90cabe5671c29d575690924", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/deb2c2b506ff6fdbb340e00b34e9901e1605f293", + "reference": "deb2c2b506ff6fdbb340e00b34e9901e1605f293", "shasum": "" }, "require": { @@ -6311,7 +6313,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v7.0.7" + "source": "https://github.com/symfony/var-dumper/tree/v7.1.1" }, "funding": [ { @@ -6327,20 +6329,20 @@ "type": "tidelift" } ], - "time": "2024-04-18T09:29:19+00:00" + "time": "2024-05-31T14:57:53+00:00" }, { "name": "symfony/yaml", - "version": "v7.0.7", + "version": "v7.1.1", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "0d3916ae69ea28b59d94b60c4f2b50f4e25adb5c" + "reference": "fa34c77015aa6720469db7003567b9f772492bf2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/0d3916ae69ea28b59d94b60c4f2b50f4e25adb5c", - "reference": "0d3916ae69ea28b59d94b60c4f2b50f4e25adb5c", + "url": "https://api.github.com/repos/symfony/yaml/zipball/fa34c77015aa6720469db7003567b9f772492bf2", + "reference": "fa34c77015aa6720469db7003567b9f772492bf2", "shasum": "" }, "require": { @@ -6382,7 +6384,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v7.0.7" + "source": "https://github.com/symfony/yaml/tree/v7.1.1" }, "funding": [ { @@ -6398,7 +6400,7 @@ "type": "tidelift" } ], - "time": "2024-04-28T11:44:19+00:00" + "time": "2024-05-31T14:57:53+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -6746,16 +6748,16 @@ }, { "name": "zircote/swagger-php", - "version": "4.9.2", + "version": "4.10.0", "source": { "type": "git", "url": "https://github.com/zircote/swagger-php.git", - "reference": "256d42cb07ba1c2206d66bc7516ee3d3e3e9f0b2" + "reference": "2d983ce67b9eb7e18403ae7bc5e765f8ce7b8d56" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zircote/swagger-php/zipball/256d42cb07ba1c2206d66bc7516ee3d3e3e9f0b2", - "reference": "256d42cb07ba1c2206d66bc7516ee3d3e3e9f0b2", + "url": "https://api.github.com/repos/zircote/swagger-php/zipball/2d983ce67b9eb7e18403ae7bc5e765f8ce7b8d56", + "reference": "2d983ce67b9eb7e18403ae7bc5e765f8ce7b8d56", "shasum": "" }, "require": { @@ -6821,9 +6823,9 @@ ], "support": { "issues": "https://github.com/zircote/swagger-php/issues", - "source": "https://github.com/zircote/swagger-php/tree/4.9.2" + "source": "https://github.com/zircote/swagger-php/tree/4.10.0" }, - "time": "2024-05-02T21:36:00+00:00" + "time": "2024-06-06T22:42:02+00:00" } ], "packages-dev": [ @@ -7384,16 +7386,16 @@ }, { "name": "composer/class-map-generator", - "version": "1.1.1", + "version": "1.3.3", "source": { "type": "git", "url": "https://github.com/composer/class-map-generator.git", - "reference": "8286a62d243312ed99b3eee20d5005c961adb311" + "reference": "61804f9973685ec7bead0fb7fe022825e3cd418e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/class-map-generator/zipball/8286a62d243312ed99b3eee20d5005c961adb311", - "reference": "8286a62d243312ed99b3eee20d5005c961adb311", + "url": "https://api.github.com/repos/composer/class-map-generator/zipball/61804f9973685ec7bead0fb7fe022825e3cd418e", + "reference": "61804f9973685ec7bead0fb7fe022825e3cd418e", "shasum": "" }, "require": { @@ -7437,7 +7439,7 @@ ], "support": { "issues": "https://github.com/composer/class-map-generator/issues", - "source": "https://github.com/composer/class-map-generator/tree/1.1.1" + "source": "https://github.com/composer/class-map-generator/tree/1.3.3" }, "funding": [ { @@ -7453,7 +7455,7 @@ "type": "tidelift" } ], - "time": "2024-03-15T12:53:41+00:00" + "time": "2024-06-10T11:53:54+00:00" }, { "name": "composer/package-versions-deprecated", @@ -8242,16 +8244,16 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v3.58.0", + "version": "v3.58.1", "source": { "type": "git", "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git", - "reference": "55d3483c80c09f91d876aa4e2971ce349d07310c" + "reference": "04e9424025677a86914b9a4944dbbf4060bb0aff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/55d3483c80c09f91d876aa4e2971ce349d07310c", - "reference": "55d3483c80c09f91d876aa4e2971ce349d07310c", + "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/04e9424025677a86914b9a4944dbbf4060bb0aff", + "reference": "04e9424025677a86914b9a4944dbbf4060bb0aff", "shasum": "" }, "require": { @@ -8330,7 +8332,7 @@ ], "support": { "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues", - "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.58.0" + "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.58.1" }, "funding": [ { @@ -8338,7 +8340,7 @@ "type": "github" } ], - "time": "2024-05-28T16:55:30+00:00" + "time": "2024-05-29T16:39:07+00:00" }, { "name": "hamcrest/hamcrest-php", @@ -9242,16 +9244,16 @@ }, { "name": "orchestra/testbench-core", - "version": "v9.1.1", + "version": "v9.1.6", "source": { "type": "git", "url": "https://github.com/orchestral/testbench-core.git", - "reference": "113478a0c27edcbe6fe95456e448bf8cae2ff6db" + "reference": "66116144568050cc55a08fc93458b22b60e75740" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/orchestral/testbench-core/zipball/113478a0c27edcbe6fe95456e448bf8cae2ff6db", - "reference": "113478a0c27edcbe6fe95456e448bf8cae2ff6db", + "url": "https://api.github.com/repos/orchestral/testbench-core/zipball/66116144568050cc55a08fc93458b22b60e75740", + "reference": "66116144568050cc55a08fc93458b22b60e75740", "shasum": "" }, "require": { @@ -9327,20 +9329,20 @@ "issues": "https://github.com/orchestral/testbench/issues", "source": "https://github.com/orchestral/testbench-core" }, - "time": "2024-05-23T02:19:56+00:00" + "time": "2024-06-10T10:24:57+00:00" }, { "name": "pestphp/pest", - "version": "v2.34.7", + "version": "v2.34.8", "source": { "type": "git", "url": "https://github.com/pestphp/pest.git", - "reference": "a7a3e4240e341d0fee1c54814ce18adc26ce5a76" + "reference": "e8f122bf47585c06431e0056189ec6bfd6f41f57" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pestphp/pest/zipball/a7a3e4240e341d0fee1c54814ce18adc26ce5a76", - "reference": "a7a3e4240e341d0fee1c54814ce18adc26ce5a76", + "url": "https://api.github.com/repos/pestphp/pest/zipball/e8f122bf47585c06431e0056189ec6bfd6f41f57", + "reference": "e8f122bf47585c06431e0056189ec6bfd6f41f57", "shasum": "" }, "require": { @@ -9359,8 +9361,8 @@ }, "require-dev": { "pestphp/pest-dev-tools": "^2.16.0", - "pestphp/pest-plugin-type-coverage": "^2.8.1", - "symfony/process": "^6.4.0|^7.0.4" + "pestphp/pest-plugin-type-coverage": "^2.8.3", + "symfony/process": "^6.4.0|^7.1.1" }, "bin": [ "bin/pest" @@ -9423,7 +9425,7 @@ ], "support": { "issues": "https://github.com/pestphp/pest/issues", - "source": "https://github.com/pestphp/pest/tree/v2.34.7" + "source": "https://github.com/pestphp/pest/tree/v2.34.8" }, "funding": [ { @@ -9435,7 +9437,7 @@ "type": "github" } ], - "time": "2024-04-05T07:44:17+00:00" + "time": "2024-06-10T22:02:16+00:00" }, { "name": "pestphp/pest-plugin", @@ -10035,16 +10037,16 @@ }, { "name": "phpstan/extension-installer", - "version": "1.3.1", + "version": "1.4.1", "source": { "type": "git", "url": "https://github.com/phpstan/extension-installer.git", - "reference": "f45734bfb9984c6c56c4486b71230355f066a58a" + "reference": "f6b87faf9fc7978eab2f7919a8760bc9f58f9203" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/extension-installer/zipball/f45734bfb9984c6c56c4486b71230355f066a58a", - "reference": "f45734bfb9984c6c56c4486b71230355f066a58a", + "url": "https://api.github.com/repos/phpstan/extension-installer/zipball/f6b87faf9fc7978eab2f7919a8760bc9f58f9203", + "reference": "f6b87faf9fc7978eab2f7919a8760bc9f58f9203", "shasum": "" }, "require": { @@ -10073,22 +10075,22 @@ "description": "Composer plugin for automatic installation of PHPStan extensions", "support": { "issues": "https://github.com/phpstan/extension-installer/issues", - "source": "https://github.com/phpstan/extension-installer/tree/1.3.1" + "source": "https://github.com/phpstan/extension-installer/tree/1.4.1" }, - "time": "2023-05-24T08:59:17+00:00" + "time": "2024-06-10T08:20:49+00:00" }, { "name": "phpstan/phpdoc-parser", - "version": "1.29.0", + "version": "1.29.1", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "536889f2b340489d328f5ffb7b02bb6b183ddedc" + "reference": "fcaefacf2d5c417e928405b71b400d4ce10daaf4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/536889f2b340489d328f5ffb7b02bb6b183ddedc", - "reference": "536889f2b340489d328f5ffb7b02bb6b183ddedc", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/fcaefacf2d5c417e928405b71b400d4ce10daaf4", + "reference": "fcaefacf2d5c417e928405b71b400d4ce10daaf4", "shasum": "" }, "require": { @@ -10120,22 +10122,22 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.29.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.29.1" }, - "time": "2024-05-06T12:04:23+00:00" + "time": "2024-05-31T08:52:43+00:00" }, { "name": "phpstan/phpstan", - "version": "1.11.2", + "version": "1.11.4", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "0d5d4294a70deb7547db655c47685d680e39cfec" + "reference": "9100a76ce8015b9aa7125b9171ae3a76887b6c82" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/0d5d4294a70deb7547db655c47685d680e39cfec", - "reference": "0d5d4294a70deb7547db655c47685d680e39cfec", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/9100a76ce8015b9aa7125b9171ae3a76887b6c82", + "reference": "9100a76ce8015b9aa7125b9171ae3a76887b6c82", "shasum": "" }, "require": { @@ -10180,7 +10182,7 @@ "type": "github" } ], - "time": "2024-05-24T13:23:04+00:00" + "time": "2024-06-06T12:19:22+00:00" }, { "name": "phpstan/phpstan-deprecation-rules", @@ -12887,22 +12889,24 @@ }, { "name": "symfony/filesystem", - "version": "v7.0.7", + "version": "v7.1.1", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "cc168be6fbdcdf3401f50ae863ee3818ed4338f5" + "reference": "802e87002f919296c9f606457d9fa327a0b3d6b2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/cc168be6fbdcdf3401f50ae863ee3818ed4338f5", - "reference": "cc168be6fbdcdf3401f50ae863ee3818ed4338f5", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/802e87002f919296c9f606457d9fa327a0b3d6b2", + "reference": "802e87002f919296c9f606457d9fa327a0b3d6b2", "shasum": "" }, "require": { "php": ">=8.2", "symfony/polyfill-ctype": "~1.8", - "symfony/polyfill-mbstring": "~1.8", + "symfony/polyfill-mbstring": "~1.8" + }, + "require-dev": { "symfony/process": "^6.4|^7.0" }, "type": "library", @@ -12931,7 +12935,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v7.0.7" + "source": "https://github.com/symfony/filesystem/tree/v7.1.1" }, "funding": [ { @@ -12947,7 +12951,7 @@ "type": "tidelift" } ], - "time": "2024-04-18T09:29:19+00:00" + "time": "2024-05-31T14:57:53+00:00" }, { "name": "symfony/polyfill-php81", @@ -13027,16 +13031,16 @@ }, { "name": "symfony/stopwatch", - "version": "v7.0.7", + "version": "v7.1.1", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", - "reference": "41a7a24aa1dc82adf46a06bc292d1923acfe6b84" + "reference": "5b75bb1ac2ba1b9d05c47fc4b3046a625377d23d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/41a7a24aa1dc82adf46a06bc292d1923acfe6b84", - "reference": "41a7a24aa1dc82adf46a06bc292d1923acfe6b84", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/5b75bb1ac2ba1b9d05c47fc4b3046a625377d23d", + "reference": "5b75bb1ac2ba1b9d05c47fc4b3046a625377d23d", "shasum": "" }, "require": { @@ -13069,7 +13073,7 @@ "description": "Provides a way to profile code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/stopwatch/tree/v7.0.7" + "source": "https://github.com/symfony/stopwatch/tree/v7.1.1" }, "funding": [ { @@ -13085,7 +13089,7 @@ "type": "tidelift" } ], - "time": "2024-04-18T09:29:19+00:00" + "time": "2024-05-31T14:57:53+00:00" }, { "name": "ta-tikoma/phpunit-architecture-test", @@ -13447,16 +13451,16 @@ }, { "name": "wayofdev/cs-fixer-config", - "version": "v1.5.0", + "version": "v1.5.1", "source": { "type": "git", "url": "https://github.com/wayofdev/php-cs-fixer-config.git", - "reference": "1300d46e72b7893b038c429585206981820fb4e8" + "reference": "1edacc13db903e85ab42d5ff7d5fc04d11663d8e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wayofdev/php-cs-fixer-config/zipball/1300d46e72b7893b038c429585206981820fb4e8", - "reference": "1300d46e72b7893b038c429585206981820fb4e8", + "url": "https://api.github.com/repos/wayofdev/php-cs-fixer-config/zipball/1edacc13db903e85ab42d5ff7d5fc04d11663d8e", + "reference": "1edacc13db903e85ab42d5ff7d5fc04d11663d8e", "shasum": "" }, "require": { @@ -13473,6 +13477,7 @@ "phpstan/phpstan-strict-rules": "^1.6", "phpunit/phpunit": "^10.5", "psalm/plugin-phpunit": "~0.19.0", + "rector/rector": "^1.1", "roave/infection-static-analysis-plugin": "^1.35", "vimeo/psalm": "^5.23.1" }, @@ -13521,7 +13526,7 @@ "type": "github" } ], - "time": "2024-05-29T08:43:41+00:00" + "time": "2024-06-05T19:23:33+00:00" } ], "aliases": [], diff --git a/app/config/app.php b/app/config/app.php index 97b4b725..d7c31885 100644 --- a/app/config/app.php +++ b/app/config/app.php @@ -108,17 +108,17 @@ /* * Application Service Providers... */ - Laravel\Providers\AppServiceProvider::class, - Laravel\Providers\AuthServiceProvider::class, - Laravel\Providers\EventServiceProvider::class, - Laravel\Providers\RouteServiceProvider::class, + Bridge\Laravel\Providers\AppServiceProvider::class, + Bridge\Laravel\Providers\AuthServiceProvider::class, + Bridge\Laravel\Providers\EventServiceProvider::class, + Bridge\Laravel\Providers\RouteServiceProvider::class, /* * Domain Service Providers */ - Laravel\Providers\Domain\UserServiceProvider::class, - Laravel\Providers\Domain\CategoryServiceProvider::class, - Laravel\Providers\Domain\ProductServiceProvider::class, + Bridge\Laravel\Providers\Domain\UserServiceProvider::class, + Bridge\Laravel\Providers\Domain\CategoryServiceProvider::class, + Bridge\Laravel\Providers\Domain\ProductServiceProvider::class, ])->toArray(), /* diff --git a/app/config/database.php b/app/config/database.php index 31cd2559..19db6634 100644 --- a/app/config/database.php +++ b/app/config/database.php @@ -23,6 +23,14 @@ * is supported by Laravel. You're free to add / remove connections. */ 'connections' => [ + 'memory' => [ + 'driver' => 'sqlite', + 'url' => env('DB_URL'), + 'database' => ':memory:', + 'prefix' => '', + 'foreign_key_constraints' => env('DB_FOREIGN_KEYS', true), + ], + 'sqlite' => [ 'driver' => 'sqlite', 'url' => env('DB_URL'), diff --git a/app/phpunit.xml.dist b/app/phpunit.xml.dist index 38690a28..bbf81e2b 100644 --- a/app/phpunit.xml.dist +++ b/app/phpunit.xml.dist @@ -17,7 +17,7 @@ - ./src + ./src @@ -28,7 +28,6 @@ - - + diff --git a/app/psalm-baseline.xml b/app/psalm-baseline.xml index d54498e6..2023d354 100644 --- a/app/psalm-baseline.xml +++ b/app/psalm-baseline.xml @@ -46,7 +46,6 @@ - @@ -150,16 +149,6 @@ - - - - - - - - user()?->id]]> - - @@ -169,7 +158,6 @@ - @@ -218,11 +206,8 @@ - - - - + @@ -276,117 +261,4 @@ - - - - - - - - name = $name]]> - - - aliases]]> - - - name]]> - - - help]]> - - - aliases]]> - - - name]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - routeMiddleware]]> - - - - - - - - - - getRulesWithoutPlaceholders()]]> - getRulesWithoutPlaceholders()]]> - - - - - - - - - - - - - - - - - diff --git a/app/psalm.xml b/app/psalm.xml index 1109fdf1..22a3e7b5 100644 --- a/app/psalm.xml +++ b/app/psalm.xml @@ -21,6 +21,9 @@ + + + diff --git a/app/src/Bridge/Laravel/Admin/Category/Controllers/CategoryController.php b/app/src/Bridge/Laravel/Admin/Category/Controllers/CategoryController.php index 5728abfd..afdd587c 100644 --- a/app/src/Bridge/Laravel/Admin/Category/Controllers/CategoryController.php +++ b/app/src/Bridge/Laravel/Admin/Category/Controllers/CategoryController.php @@ -2,13 +2,13 @@ declare(strict_types=1); -namespace Laravel\Admin\Category\Controllers; +namespace Bridge\Laravel\Admin\Category\Controllers; +use Bridge\Laravel\Admin\Category\Queries\IndexQuery; +use Bridge\Laravel\Admin\Category\Transformers\CategoryTransformer; +use Bridge\Laravel\Http\Controller; use Domain\Category\Models\Category; use Illuminate\Http\JsonResponse; -use Laravel\Admin\Category\Queries\IndexQuery; -use Laravel\Admin\Category\Transformers\CategoryTransformer; -use Laravel\Http\Controller; use Spatie\RouteAttributes\Attributes\Resource; #[Resource( diff --git a/app/src/Bridge/Laravel/Admin/Category/Queries/IndexQuery.php b/app/src/Bridge/Laravel/Admin/Category/Queries/IndexQuery.php index 619d57db..e3d0af35 100644 --- a/app/src/Bridge/Laravel/Admin/Category/Queries/IndexQuery.php +++ b/app/src/Bridge/Laravel/Admin/Category/Queries/IndexQuery.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Laravel\Admin\Category\Queries; +namespace Bridge\Laravel\Admin\Category\Queries; use Domain\Category\Models\Category; use Illuminate\Http\Request; diff --git a/app/src/Bridge/Laravel/Admin/Category/Transformers/CategoryTransformer.php b/app/src/Bridge/Laravel/Admin/Category/Transformers/CategoryTransformer.php index 9f58102f..251e0c3a 100644 --- a/app/src/Bridge/Laravel/Admin/Category/Transformers/CategoryTransformer.php +++ b/app/src/Bridge/Laravel/Admin/Category/Transformers/CategoryTransformer.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Laravel\Admin\Category\Transformers; +namespace Bridge\Laravel\Admin\Category\Transformers; use Domain\Category\Models\Category; use League\Fractal\TransformerAbstract; diff --git a/app/src/Bridge/Laravel/Admin/Network/Controllers/NetworkController.php b/app/src/Bridge/Laravel/Admin/Network/Controllers/NetworkController.php index 49bc2efe..e5a0c191 100644 --- a/app/src/Bridge/Laravel/Admin/Network/Controllers/NetworkController.php +++ b/app/src/Bridge/Laravel/Admin/Network/Controllers/NetworkController.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Laravel\Admin\Network\Controllers; +namespace Bridge\Laravel\Admin\Network\Controllers; -use Laravel\Http\Controller; +use Bridge\Laravel\Http\Controller; use Spatie\RouteAttributes\Attributes\Resource; #[Resource( diff --git a/app/src/Bridge/Laravel/Admin/Product/Controllers/ProductController.php b/app/src/Bridge/Laravel/Admin/Product/Controllers/ProductController.php index 8a482e7f..54fd158b 100644 --- a/app/src/Bridge/Laravel/Admin/Product/Controllers/ProductController.php +++ b/app/src/Bridge/Laravel/Admin/Product/Controllers/ProductController.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Laravel\Admin\Product\Controllers; +namespace Bridge\Laravel\Admin\Product\Controllers; -use Laravel\Http\Controller; +use Bridge\Laravel\Http\Controller; use Spatie\RouteAttributes\Attributes\Resource; #[Resource( diff --git a/app/src/Bridge/Laravel/Admin/User/Controllers/UserController.php b/app/src/Bridge/Laravel/Admin/User/Controllers/UserController.php index 7444f67a..692b51ad 100644 --- a/app/src/Bridge/Laravel/Admin/User/Controllers/UserController.php +++ b/app/src/Bridge/Laravel/Admin/User/Controllers/UserController.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Laravel\Admin\User\Controllers; +namespace Bridge\Laravel\Admin\User\Controllers; -use Laravel\Http\Controller; +use Bridge\Laravel\Http\Controller; use Spatie\RouteAttributes\Attributes\Resource; #[Resource( diff --git a/app/src/Bridge/Laravel/Application.php b/app/src/Bridge/Laravel/Application.php index 012fd33d..07e9596d 100644 --- a/app/src/Bridge/Laravel/Application.php +++ b/app/src/Bridge/Laravel/Application.php @@ -2,13 +2,13 @@ declare(strict_types=1); -namespace Laravel; +namespace Bridge\Laravel; use Illuminate\Foundation\Application as LaravelApplication; class Application extends LaravelApplication { - protected $namespace = 'Laravel\\'; + protected $namespace = 'Bridge\\Laravel\\'; public function path($path = ''): string { diff --git a/app/src/Bridge/Laravel/Console/Commands/DemoCommand.php b/app/src/Bridge/Laravel/Console/Commands/DemoCommand.php index b43adbf5..6f27602e 100644 --- a/app/src/Bridge/Laravel/Console/Commands/DemoCommand.php +++ b/app/src/Bridge/Laravel/Console/Commands/DemoCommand.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Laravel\Console\Commands; +namespace Bridge\Laravel\Console\Commands; use Illuminate\Console\Command; diff --git a/app/src/Bridge/Laravel/ConsoleKernel.php b/app/src/Bridge/Laravel/ConsoleKernel.php index 1f3d5bbc..e9c76873 100644 --- a/app/src/Bridge/Laravel/ConsoleKernel.php +++ b/app/src/Bridge/Laravel/ConsoleKernel.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Laravel; +namespace Bridge\Laravel; use Illuminate\Console\Scheduling\Schedule; use Illuminate\Foundation\Console\Kernel as BaseConsoleKernel; diff --git a/app/src/Bridge/Laravel/Exceptions/Handler.php b/app/src/Bridge/Laravel/Exceptions/Handler.php index d5955d66..13411a89 100644 --- a/app/src/Bridge/Laravel/Exceptions/Handler.php +++ b/app/src/Bridge/Laravel/Exceptions/Handler.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Laravel\Exceptions; +namespace Bridge\Laravel\Exceptions; use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler; use Throwable; diff --git a/app/src/Bridge/Laravel/Http/Controller.php b/app/src/Bridge/Laravel/Http/Controller.php index 18a17ae3..4aab9fd8 100644 --- a/app/src/Bridge/Laravel/Http/Controller.php +++ b/app/src/Bridge/Laravel/Http/Controller.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Laravel\Http; +namespace Bridge\Laravel\Http; use Illuminate\Foundation\Auth\Access\AuthorizesRequests; use Illuminate\Foundation\Validation\ValidatesRequests; diff --git a/app/src/Bridge/Laravel/Http/Middleware/Authenticate.php b/app/src/Bridge/Laravel/Http/Middleware/Authenticate.php index b8963833..5f6cf934 100644 --- a/app/src/Bridge/Laravel/Http/Middleware/Authenticate.php +++ b/app/src/Bridge/Laravel/Http/Middleware/Authenticate.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Laravel\Http\Middleware; +namespace Bridge\Laravel\Http\Middleware; use Illuminate\Auth\Middleware\Authenticate as Middleware; use Illuminate\Http\Request; diff --git a/app/src/Bridge/Laravel/Http/Middleware/RedirectIfAuthenticated.php b/app/src/Bridge/Laravel/Http/Middleware/RedirectIfAuthenticated.php index 790fc848..aa4c2d55 100644 --- a/app/src/Bridge/Laravel/Http/Middleware/RedirectIfAuthenticated.php +++ b/app/src/Bridge/Laravel/Http/Middleware/RedirectIfAuthenticated.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace Laravel\Http\Middleware; +namespace Bridge\Laravel\Http\Middleware; +use Bridge\Laravel\Providers\RouteServiceProvider; use Closure; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; -use Laravel\Providers\RouteServiceProvider; use Symfony\Component\HttpFoundation\Response; final class RedirectIfAuthenticated diff --git a/app/src/Bridge/Laravel/Http/Middleware/TrimStrings.php b/app/src/Bridge/Laravel/Http/Middleware/TrimStrings.php index 1d78feca..368d3fe7 100644 --- a/app/src/Bridge/Laravel/Http/Middleware/TrimStrings.php +++ b/app/src/Bridge/Laravel/Http/Middleware/TrimStrings.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Laravel\Http\Middleware; +namespace Bridge\Laravel\Http\Middleware; use Illuminate\Foundation\Http\Middleware\TrimStrings as Middleware; diff --git a/app/src/Bridge/Laravel/Http/Middleware/TrustHosts.php b/app/src/Bridge/Laravel/Http/Middleware/TrustHosts.php index 0e2cf1d3..06da29de 100644 --- a/app/src/Bridge/Laravel/Http/Middleware/TrustHosts.php +++ b/app/src/Bridge/Laravel/Http/Middleware/TrustHosts.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Laravel\Http\Middleware; +namespace Bridge\Laravel\Http\Middleware; use Illuminate\Http\Middleware\TrustHosts as Middleware; diff --git a/app/src/Bridge/Laravel/Http/Middleware/TrustProxies.php b/app/src/Bridge/Laravel/Http/Middleware/TrustProxies.php index 9704121c..83e70a2c 100644 --- a/app/src/Bridge/Laravel/Http/Middleware/TrustProxies.php +++ b/app/src/Bridge/Laravel/Http/Middleware/TrustProxies.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Laravel\Http\Middleware; +namespace Bridge\Laravel\Http\Middleware; use Illuminate\Http\Middleware\TrustProxies as Middleware; use Symfony\Component\HttpFoundation\Request; diff --git a/app/src/Bridge/Laravel/Http/Middleware/ValidateSignature.php b/app/src/Bridge/Laravel/Http/Middleware/ValidateSignature.php index a4008e86..9aa9bde1 100644 --- a/app/src/Bridge/Laravel/Http/Middleware/ValidateSignature.php +++ b/app/src/Bridge/Laravel/Http/Middleware/ValidateSignature.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Laravel\Http\Middleware; +namespace Bridge\Laravel\Http\Middleware; use Illuminate\Routing\Middleware\ValidateSignature as Middleware; diff --git a/app/src/Bridge/Laravel/HttpKernel.php b/app/src/Bridge/Laravel/HttpKernel.php index 320f8910..b68e49fc 100644 --- a/app/src/Bridge/Laravel/HttpKernel.php +++ b/app/src/Bridge/Laravel/HttpKernel.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Laravel; +namespace Bridge\Laravel; use Illuminate\Foundation\Http\Kernel; diff --git a/app/src/Bridge/Laravel/Providers/AppServiceProvider.php b/app/src/Bridge/Laravel/Providers/AppServiceProvider.php index ac271383..ca129910 100644 --- a/app/src/Bridge/Laravel/Providers/AppServiceProvider.php +++ b/app/src/Bridge/Laravel/Providers/AppServiceProvider.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Laravel\Providers; +namespace Bridge\Laravel\Providers; use Illuminate\Support\ServiceProvider; diff --git a/app/src/Bridge/Laravel/Providers/AuthServiceProvider.php b/app/src/Bridge/Laravel/Providers/AuthServiceProvider.php index 69b2235d..dbe50839 100644 --- a/app/src/Bridge/Laravel/Providers/AuthServiceProvider.php +++ b/app/src/Bridge/Laravel/Providers/AuthServiceProvider.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Laravel\Providers; +namespace Bridge\Laravel\Providers; // use Illuminate\Support\Facades\Gate; use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider; diff --git a/app/src/Bridge/Laravel/Providers/Domain/CategoryServiceProvider.php b/app/src/Bridge/Laravel/Providers/Domain/CategoryServiceProvider.php index f4048777..6a297d15 100644 --- a/app/src/Bridge/Laravel/Providers/Domain/CategoryServiceProvider.php +++ b/app/src/Bridge/Laravel/Providers/Domain/CategoryServiceProvider.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Laravel\Providers\Domain; +namespace Bridge\Laravel\Providers\Domain; use Domain\Category\Exceptions\CategoryNotFoundException; use Domain\Category\Models\Category; diff --git a/app/src/Bridge/Laravel/Providers/Domain/ProductServiceProvider.php b/app/src/Bridge/Laravel/Providers/Domain/ProductServiceProvider.php index d3dd5abd..d79118a5 100644 --- a/app/src/Bridge/Laravel/Providers/Domain/ProductServiceProvider.php +++ b/app/src/Bridge/Laravel/Providers/Domain/ProductServiceProvider.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Laravel\Providers\Domain; +namespace Bridge\Laravel\Providers\Domain; use Domain\Product\Exceptions\ProductNotFoundException; use Domain\Product\Models\Product; diff --git a/app/src/Bridge/Laravel/Providers/Domain/UserServiceProvider.php b/app/src/Bridge/Laravel/Providers/Domain/UserServiceProvider.php index 12f0f0f0..28d1f587 100644 --- a/app/src/Bridge/Laravel/Providers/Domain/UserServiceProvider.php +++ b/app/src/Bridge/Laravel/Providers/Domain/UserServiceProvider.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Laravel\Providers\Domain; +namespace Bridge\Laravel\Providers\Domain; use Domain\User\Exceptions\UserNotFoundException; use Domain\User\Models\User; diff --git a/app/src/Bridge/Laravel/Providers/EventServiceProvider.php b/app/src/Bridge/Laravel/Providers/EventServiceProvider.php index 9af1ec96..ad55c3c1 100644 --- a/app/src/Bridge/Laravel/Providers/EventServiceProvider.php +++ b/app/src/Bridge/Laravel/Providers/EventServiceProvider.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Laravel\Providers; +namespace Bridge\Laravel\Providers; use Illuminate\Auth\Events\Registered; use Illuminate\Auth\Listeners\SendEmailVerificationNotification; diff --git a/app/src/Bridge/Laravel/Providers/RouteServiceProvider.php b/app/src/Bridge/Laravel/Providers/RouteServiceProvider.php index d38221e2..f4486fca 100644 --- a/app/src/Bridge/Laravel/Providers/RouteServiceProvider.php +++ b/app/src/Bridge/Laravel/Providers/RouteServiceProvider.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Laravel\Providers; +namespace Bridge\Laravel\Providers; use Illuminate\Cache\RateLimiting\Limit; use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider; @@ -19,7 +19,7 @@ final class RouteServiceProvider extends ServiceProvider * * @var string */ - public const HOME = '/home'; + public const string HOME = '/home'; /** * Define your route model bindings, pattern filters, and other route configuration. diff --git a/app/src/Bridge/Laravel/Public/Category/Controllers/CategoryController.php b/app/src/Bridge/Laravel/Public/Category/Controllers/CategoryController.php index 4924c4e5..d4e2361d 100644 --- a/app/src/Bridge/Laravel/Public/Category/Controllers/CategoryController.php +++ b/app/src/Bridge/Laravel/Public/Category/Controllers/CategoryController.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Laravel\Public\Category\Controllers; +namespace Bridge\Laravel\Public\Category\Controllers; -use Laravel\Http\Controller; +use Bridge\Laravel\Http\Controller; use Spatie\RouteAttributes\Attributes\Resource; #[Resource( diff --git a/app/src/Bridge/Laravel/Public/Category/Queries/IndexQuery.php b/app/src/Bridge/Laravel/Public/Category/Queries/IndexQuery.php index 20f4f84a..09eea2bf 100644 --- a/app/src/Bridge/Laravel/Public/Category/Queries/IndexQuery.php +++ b/app/src/Bridge/Laravel/Public/Category/Queries/IndexQuery.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Laravel\Public\Category\Queries; +namespace Bridge\Laravel\Public\Category\Queries; use Domain\Category\Models\Category; use Illuminate\Http\Request; diff --git a/app/src/Bridge/Laravel/Public/Network/Controllers/NetworkController.php b/app/src/Bridge/Laravel/Public/Network/Controllers/NetworkController.php index 1fcdbe64..26b11896 100644 --- a/app/src/Bridge/Laravel/Public/Network/Controllers/NetworkController.php +++ b/app/src/Bridge/Laravel/Public/Network/Controllers/NetworkController.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Laravel\Public\Network\Controllers; +namespace Bridge\Laravel\Public\Network\Controllers; -use Laravel\Http\Controller; +use Bridge\Laravel\Http\Controller; use Spatie\RouteAttributes\Attributes\Resource; #[Resource( diff --git a/app/src/Bridge/Laravel/Public/Product/Controllers/ProductController.php b/app/src/Bridge/Laravel/Public/Product/Controllers/ProductController.php index 98da7518..e76090f5 100644 --- a/app/src/Bridge/Laravel/Public/Product/Controllers/ProductController.php +++ b/app/src/Bridge/Laravel/Public/Product/Controllers/ProductController.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Laravel\Public\Product\Controllers; +namespace Bridge\Laravel\Public\Product\Controllers; -use Laravel\Http\Controller; +use Bridge\Laravel\Http\Controller; use Spatie\RouteAttributes\Attributes\Resource; #[Resource( diff --git a/app/src/Bridge/Laravel/Public/User/Controllers/UserController.php b/app/src/Bridge/Laravel/Public/User/Controllers/UserController.php index 57810cb2..b86ae839 100644 --- a/app/src/Bridge/Laravel/Public/User/Controllers/UserController.php +++ b/app/src/Bridge/Laravel/Public/User/Controllers/UserController.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Laravel\Public\User\Controllers; +namespace Bridge\Laravel\Public\User\Controllers; -use Laravel\Http\Controller; +use Bridge\Laravel\Http\Controller; use Spatie\RouteAttributes\Attributes\Resource; #[Resource( diff --git a/app/tests/Bridge/Laravel/Admin/Category/Controllers/CategoryControllerTest.php b/app/tests/Bridge/Laravel/Admin/Category/Controllers/CategoryControllerTest.php index 5e84a1f4..31ffb4fa 100644 --- a/app/tests/Bridge/Laravel/Admin/Category/Controllers/CategoryControllerTest.php +++ b/app/tests/Bridge/Laravel/Admin/Category/Controllers/CategoryControllerTest.php @@ -10,7 +10,7 @@ final class CategoryControllerTest extends TestCase { - private const API_BASE_PATH = '/api/admin/categories'; + private const string API_BASE_PATH = '/api/admin/categories'; /** * @test diff --git a/docker-compose.override.yaml.dist b/docker-compose.override.yaml.dist index 58e97077..2f6c67e8 100644 --- a/docker-compose.override.yaml.dist +++ b/docker-compose.override.yaml.dist @@ -12,7 +12,7 @@ services: links: - database external_links: - - "rabbitmq.${PROJECT_SERVICES_NAMESPACE}.alias:rabbitmq" + - "rabbitmq.${COMPOSE_PROJECT_NAME}.alias:rabbitmq" environment: APP_NAME: ${APP_NAME} COMPOSER_AUTH: ${COMPOSER_AUTH} diff --git a/docker-compose.yaml b/docker-compose.yaml index fde9dbd2..c931d722 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -13,7 +13,7 @@ services: links: - database external_links: - - 'rabbitmq.${PROJECT_SERVICES_NAMESPACE}.alias:rabbitmq' + - 'rabbitmq.${COMPOSE_PROJECT_NAME}.alias:rabbitmq' volumes: - ./app:/app:rw,cached - ./.env:/app/.env