From ef63fcaa9dae620d5a1f44356ad218d4ca1f26cd Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Tue, 3 Sep 2024 14:55:11 +0200 Subject: [PATCH 01/44] PHP 8.4 build --- .github/workflows/databases-nightly.yml | 97 --------- .github/workflows/databases.yml | 278 ------------------------ .github/workflows/queues.yml | 164 -------------- .github/workflows/static-analysis.yml | 43 ---- .github/workflows/tests.yml | 138 ++++++------ 5 files changed, 69 insertions(+), 651 deletions(-) delete mode 100644 .github/workflows/databases-nightly.yml delete mode 100644 .github/workflows/databases.yml delete mode 100644 .github/workflows/queues.yml delete mode 100644 .github/workflows/static-analysis.yml diff --git a/.github/workflows/databases-nightly.yml b/.github/workflows/databases-nightly.yml deleted file mode 100644 index 12f7b87352c6..000000000000 --- a/.github/workflows/databases-nightly.yml +++ /dev/null @@ -1,97 +0,0 @@ -name: databases-nightly - -on: - schedule: - - cron: '0 0 * * *' - -jobs: - mysql_9: - runs-on: ubuntu-24.04 - - services: - mysql: - image: mysql:9 - env: - MYSQL_ALLOW_EMPTY_PASSWORD: yes - MYSQL_DATABASE: laravel - ports: - - 3306:3306 - options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3 - - strategy: - fail-fast: true - - name: MySQL 9 - - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: 8.2 - extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_mysql, :php-psr - tools: composer:v2 - coverage: none - - - name: Set Framework version - run: composer config version "11.x-dev" - - - name: Install dependencies - uses: nick-fields/retry@v3 - with: - timeout_minutes: 5 - max_attempts: 5 - command: composer update --prefer-stable --prefer-dist --no-interaction --no-progress - - - name: Execute tests - run: vendor/bin/phpunit tests/Integration/Database - env: - DB_CONNECTION: mysql - - mariadb: - runs-on: ubuntu-24.04 - continue-on-error: true - - services: - mariadb: - image: quay.io/mariadb-foundation/mariadb-devel:verylatest - env: - MARIADB_ALLOW_EMPTY_ROOT_PASSWORD: yes - MARIADB_DATABASE: laravel - ports: - - 3306:3306 - options: --health-cmd="healthcheck.sh --connect --innodb_initialized" --health-interval=10s --health-timeout=5s --health-retries=3 - - strategy: - fail-fast: true - - name: MariaDB Very Latest - - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: 8.2 - extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_mysql, :php-psr - tools: composer:v2 - coverage: none - - - name: Set Framework version - run: composer config version "11.x-dev" - - - name: Install dependencies - uses: nick-fields/retry@v3 - with: - timeout_minutes: 5 - max_attempts: 5 - command: composer update --prefer-stable --prefer-dist --no-interaction --no-progress - - - name: Execute tests - run: vendor/bin/phpunit tests/Integration/Database - env: - DB_CONNECTION: mariadb diff --git a/.github/workflows/databases.yml b/.github/workflows/databases.yml deleted file mode 100644 index f9d387b11601..000000000000 --- a/.github/workflows/databases.yml +++ /dev/null @@ -1,278 +0,0 @@ -name: databases - -on: - push: - branches: - - master - - '*.x' - pull_request: - -jobs: - mysql_57: - runs-on: ubuntu-24.04 - - services: - mysql: - image: mysql:5.7 - env: - MYSQL_ALLOW_EMPTY_PASSWORD: yes - MYSQL_DATABASE: laravel - ports: - - 3306:3306 - options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3 - - strategy: - fail-fast: true - - name: MySQL 5.7 - - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: 8.2 - extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_mysql, :php-psr - tools: composer:v2 - coverage: none - - - name: Set Framework version - run: composer config version "11.x-dev" - - - name: Install dependencies - uses: nick-fields/retry@v3 - with: - timeout_minutes: 5 - max_attempts: 5 - command: composer update --prefer-stable --prefer-dist --no-interaction --no-progress - - - name: Execute tests - run: vendor/bin/phpunit tests/Integration/Database - env: - DB_CONNECTION: mysql - DB_COLLATION: utf8mb4_unicode_ci - - mysql_8: - runs-on: ubuntu-24.04 - - services: - mysql: - image: mysql:8 - env: - MYSQL_ALLOW_EMPTY_PASSWORD: yes - MYSQL_DATABASE: laravel - ports: - - 3306:3306 - options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3 - - strategy: - fail-fast: true - - name: MySQL 8 - - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: 8.2 - extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_mysql, :php-psr - tools: composer:v2 - coverage: none - - - name: Set Framework version - run: composer config version "11.x-dev" - - - name: Install dependencies - uses: nick-fields/retry@v3 - with: - timeout_minutes: 5 - max_attempts: 5 - command: composer update --prefer-stable --prefer-dist --no-interaction --no-progress - - - name: Execute tests - run: vendor/bin/phpunit tests/Integration/Database - env: - DB_CONNECTION: mysql - - mariadb: - runs-on: ubuntu-24.04 - - services: - mariadb: - image: mariadb:10 - env: - MARIADB_ALLOW_EMPTY_ROOT_PASSWORD: yes - MARIADB_DATABASE: laravel - ports: - - 3306:3306 - options: --health-cmd="healthcheck.sh --connect --innodb_initialized" --health-interval=10s --health-timeout=5s --health-retries=3 - - strategy: - fail-fast: true - - name: MariaDB 10 - - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: 8.2 - extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_mysql, :php-psr - tools: composer:v2 - coverage: none - - - name: Set Framework version - run: composer config version "11.x-dev" - - - name: Install dependencies - uses: nick-fields/retry@v3 - with: - timeout_minutes: 5 - max_attempts: 5 - command: composer update --prefer-stable --prefer-dist --no-interaction --no-progress - - - name: Execute tests - run: vendor/bin/phpunit tests/Integration/Database - env: - DB_CONNECTION: mariadb - - pgsql: - runs-on: ubuntu-24.04 - - services: - postgresql: - image: postgres:14 - env: - POSTGRES_DB: laravel - POSTGRES_USER: forge - POSTGRES_PASSWORD: password - ports: - - 5432:5432 - options: --health-cmd=pg_isready --health-interval=10s --health-timeout=5s --health-retries=3 - - strategy: - fail-fast: true - - name: PostgreSQL 14 - - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: 8.2 - extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_pgsql, :php-psr - tools: composer:v2 - coverage: none - - - name: Set Framework version - run: composer config version "11.x-dev" - - - name: Install dependencies - uses: nick-fields/retry@v3 - with: - timeout_minutes: 5 - max_attempts: 5 - command: composer update --prefer-stable --prefer-dist --no-interaction --no-progress - - - name: Execute tests - run: vendor/bin/phpunit tests/Integration/Database - env: - DB_CONNECTION: pgsql - DB_USERNAME: forge - DB_PASSWORD: password - - mssql: - runs-on: ubuntu-22.04 - - services: - sqlsrv: - image: mcr.microsoft.com/mssql/server:2019-latest - env: - ACCEPT_EULA: Y - SA_PASSWORD: Forge123 - ports: - - 1433:1433 - - strategy: - fail-fast: true - - name: SQL Server 2019 - - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: 8.2 - extensions: dom, curl, libxml, mbstring, zip, pcntl, sqlsrv, pdo, pdo_sqlsrv, odbc, pdo_odbc, :php-psr - tools: composer:v2 - coverage: none - - - name: Set Framework version - run: composer config version "11.x-dev" - - - name: Install dependencies - uses: nick-fields/retry@v3 - with: - timeout_minutes: 5 - max_attempts: 5 - command: composer update --prefer-stable --prefer-dist --no-interaction --no-progress - - - name: Execute tests - run: vendor/bin/phpunit tests/Integration/Database - env: - DB_CONNECTION: sqlsrv - DB_DATABASE: master - DB_USERNAME: SA - DB_PASSWORD: Forge123 - - sqlite: - runs-on: ubuntu-24.04 - - strategy: - fail-fast: true - - name: SQLite - - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: 8.2 - extensions: dom, curl, libxml, mbstring, zip, pcntl, sqlsrv, pdo, pdo_sqlsrv, odbc, pdo_odbc, :php-psr - tools: composer:v2 - coverage: none - - - name: Set Framework version - run: composer config version "11.x-dev" - - - name: Install dependencies - uses: nick-fields/retry@v3 - with: - timeout_minutes: 5 - max_attempts: 5 - command: composer update --prefer-stable --prefer-dist --no-interaction --no-progress - - - name: Setup SQLite Database - run: php vendor/bin/testbench package:create-sqlite-db - - - name: Execute tests - run: vendor/bin/phpunit tests/Integration/Database/Sqlite - env: - DB_CONNECTION: sqlite diff --git a/.github/workflows/queues.yml b/.github/workflows/queues.yml deleted file mode 100644 index 0c2ee8310a06..000000000000 --- a/.github/workflows/queues.yml +++ /dev/null @@ -1,164 +0,0 @@ -name: queues - -on: - push: - branches: - - master - - '*.x' - pull_request: - -jobs: - sync: - runs-on: ubuntu-24.04 - - strategy: - fail-fast: true - - name: Sync Driver - - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: 8.2 - extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_mysql, :php-psr - tools: composer:v2 - coverage: none - - - name: Set Framework version - run: composer config version "11.x-dev" - - - name: Install dependencies - uses: nick-fields/retry@v3 - with: - timeout_minutes: 5 - max_attempts: 5 - command: composer update --prefer-stable --prefer-dist --no-interaction --no-progress - - - name: Execute tests - run: vendor/bin/phpunit tests/Integration/Queue - env: - QUEUE_CONNECTION: sync - - database: - runs-on: ubuntu-24.04 - - strategy: - fail-fast: true - - name: Database Driver - - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: 8.2 - extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_mysql, :php-psr - tools: composer:v2 - coverage: none - - - name: Set Framework version - run: composer config version "11.x-dev" - - - name: Install dependencies - uses: nick-fields/retry@v3 - with: - timeout_minutes: 5 - max_attempts: 5 - command: composer update --prefer-stable --prefer-dist --no-interaction --no-progress - - - name: Execute tests - run: vendor/bin/phpunit tests/Integration/Queue - env: - DB_CONNECTION: testing - QUEUE_CONNECTION: database - - redis: - runs-on: ubuntu-24.04 - - services: - redis: - image: redis:7.0 - ports: - - 6379:6379 - options: --entrypoint redis-server - - strategy: - fail-fast: true - - name: Redis Driver - - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: 8.2 - extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_mysql, :php-psr - tools: composer:v2 - coverage: none - - - name: Set Framework version - run: composer config version "11.x-dev" - - - name: Install dependencies - uses: nick-fields/retry@v3 - with: - timeout_minutes: 5 - max_attempts: 5 - command: composer update --prefer-stable --prefer-dist --no-interaction --no-progress - - - name: Execute tests - run: vendor/bin/phpunit tests/Integration/Queue - env: - QUEUE_CONNECTION: redis - - beanstalkd: - runs-on: ubuntu-24.04 - - name: Beanstalkd Driver - - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Download & Extract beanstalkd - run: curl -L https://github.com/beanstalkd/beanstalkd/archive/refs/tags/v1.13.tar.gz | tar xz - - - name: Make beanstalkd - run: make - working-directory: beanstalkd-1.13 - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: 8.2 - extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_mysql, :php-psr - tools: composer:v2 - coverage: none - - - name: Set Framework version - run: composer config version "11.x-dev" - - - name: Install dependencies - uses: nick-fields/retry@v3 - with: - timeout_minutes: 5 - max_attempts: 5 - command: composer update --prefer-stable --prefer-dist --no-interaction --no-progress - - - name: Daemonize beanstalkd - run: ./beanstalkd-1.13/beanstalkd & - - - name: Execute tests - run: vendor/bin/phpunit tests/Integration/Queue - env: - QUEUE_CONNECTION: beanstalkd diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml deleted file mode 100644 index 76e5aa646e7f..000000000000 --- a/.github/workflows/static-analysis.yml +++ /dev/null @@ -1,43 +0,0 @@ -name: static analysis - -on: - push: - branches: - - master - - '*.x' - pull_request: - -jobs: - types: - runs-on: ubuntu-24.04 - - strategy: - fail-fast: true - matrix: - directory: [src, types] - - name: ${{ matrix.directory == 'src' && 'Source Code' || 'Types' }} - - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: 8.2 - tools: composer:v2 - coverage: none - - - name: Set Framework version - run: composer config version "11.x-dev" - - - name: Install dependencies - uses: nick-fields/retry@v3 - with: - timeout_minutes: 5 - max_attempts: 5 - command: composer update --prefer-stable --prefer-dist --no-interaction --no-progress - - - name: Execute type checking - run: vendor/bin/phpstan --configuration="phpstan.${{ matrix.directory }}.neon.dist" diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index b3624859ce0c..6e32564bc20a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -39,7 +39,7 @@ jobs: strategy: fail-fast: true matrix: - php: [8.2, 8.3] + php: [8.4] phpunit: ['10.5', '11.0.1'] stability: [prefer-lowest, prefer-stable] @@ -103,71 +103,71 @@ jobs: vendor/orchestra/testbench-core/laravel/storage/logs !vendor/**/.gitignore - windows_tests: - runs-on: windows-2022 - - strategy: - fail-fast: true - matrix: - php: [8.2, 8.3] - phpunit: ['10.5', '11.0.1'] - stability: [prefer-lowest, prefer-stable] - - name: PHP ${{ matrix.php }} - PHPUnit ${{ matrix.phpunit }} - ${{ matrix.stability }} - Windows - - steps: - - name: Set git to use LF - run: | - git config --global core.autocrlf false - git config --global core.eol lf - - - name: Checkout code - uses: actions/checkout@v4 - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ matrix.php }} - extensions: dom, curl, libxml, mbstring, zip, pdo, sqlite, pdo_sqlite, gd, pdo_mysql, fileinfo, ftp, redis, memcached, gmp, intl, :php-psr - tools: composer:v2 - coverage: none - - - name: Set Framework version - run: composer config version "11.x-dev" - - - name: Set Minimum PHP 8.2 Versions - uses: nick-fields/retry@v3 - with: - timeout_minutes: 5 - max_attempts: 5 - command: composer require guzzlehttp/psr7:^2.4 --no-interaction --no-update - shell: bash - - - name: Set PHPUnit - uses: nick-fields/retry@v3 - with: - timeout_minutes: 5 - max_attempts: 5 - command: composer require phpunit/phpunit:^${{ matrix.phpunit }} --dev --no-interaction --no-update - shell: bash - - - name: Install dependencies - uses: nick-fields/retry@v3 - with: - timeout_minutes: 5 - max_attempts: 5 - command: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress - - - name: Execute tests - run: vendor/bin/phpunit - env: - AWS_ACCESS_KEY_ID: random_key - AWS_SECRET_ACCESS_KEY: random_secret - - - name: Store artifacts - uses: actions/upload-artifact@v4 - with: - name: windows-logs-${{ matrix.php }}-${{ matrix.phpunit }}-${{ matrix.stability }} - path: | - vendor/orchestra/testbench-core/laravel/storage/logs - !vendor/**/.gitignore + # windows_tests: + # runs-on: windows-2022 + + # strategy: + # fail-fast: true + # matrix: + # php: [8.2, 8.3] + # phpunit: ['10.5', '11.0.1'] + # stability: [prefer-lowest, prefer-stable] + + # name: PHP ${{ matrix.php }} - PHPUnit ${{ matrix.phpunit }} - ${{ matrix.stability }} - Windows + + # steps: + # - name: Set git to use LF + # run: | + # git config --global core.autocrlf false + # git config --global core.eol lf + + # - name: Checkout code + # uses: actions/checkout@v4 + + # - name: Setup PHP + # uses: shivammathur/setup-php@v2 + # with: + # php-version: ${{ matrix.php }} + # extensions: dom, curl, libxml, mbstring, zip, pdo, sqlite, pdo_sqlite, gd, pdo_mysql, fileinfo, ftp, redis, memcached, gmp, intl, :php-psr + # tools: composer:v2 + # coverage: none + + # - name: Set Framework version + # run: composer config version "11.x-dev" + + # - name: Set Minimum PHP 8.2 Versions + # uses: nick-fields/retry@v3 + # with: + # timeout_minutes: 5 + # max_attempts: 5 + # command: composer require guzzlehttp/psr7:^2.4 --no-interaction --no-update + # shell: bash + + # - name: Set PHPUnit + # uses: nick-fields/retry@v3 + # with: + # timeout_minutes: 5 + # max_attempts: 5 + # command: composer require phpunit/phpunit:^${{ matrix.phpunit }} --dev --no-interaction --no-update + # shell: bash + + # - name: Install dependencies + # uses: nick-fields/retry@v3 + # with: + # timeout_minutes: 5 + # max_attempts: 5 + # command: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress + + # - name: Execute tests + # run: vendor/bin/phpunit + # env: + # AWS_ACCESS_KEY_ID: random_key + # AWS_SECRET_ACCESS_KEY: random_secret + + # - name: Store artifacts + # uses: actions/upload-artifact@v4 + # with: + # name: windows-logs-${{ matrix.php }}-${{ matrix.phpunit }}-${{ matrix.stability }} + # path: | + # vendor/orchestra/testbench-core/laravel/storage/logs + # !vendor/**/.gitignore From 05182f84405aa97bff3deac2deb61b80e76d6058 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Tue, 3 Sep 2024 15:10:42 +0200 Subject: [PATCH 02/44] wip --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 3dbaa9700751..6d0549c944f6 100644 --- a/composer.json +++ b/composer.json @@ -114,7 +114,8 @@ "resend/resend-php": "^0.10.0", "symfony/cache": "^7.0", "symfony/http-client": "^7.0", - "symfony/psr-http-message-bridge": "^7.0" + "symfony/psr-http-message-bridge": "^7.0", + "nette/schema": "dev-master as v1.3.0" }, "conflict": { "mockery/mockery": "1.6.8", From 1aefe676cd5234b73cfc6a5179dda2c4d2afa79f Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Tue, 3 Sep 2024 15:39:22 +0200 Subject: [PATCH 03/44] wip --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6e32564bc20a..6674abb44d4e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -53,7 +53,7 @@ jobs: uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php }} - extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, gd, redis, igbinary, msgpack, lzf, zstd, lz4, memcached, gmp, :php-psr + extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, gd, redis-6.1.0RC1, igbinary, msgpack, lzf, zstd, lz4, memcached, gmp, :php-psr ini-values: error_reporting=E_ALL tools: composer:v2 coverage: none From f1c8683e899fe208f664dbac59b141c2922df0b6 Mon Sep 17 00:00:00 2001 From: Julius Kiekbusch Date: Wed, 4 Sep 2024 09:18:07 +0200 Subject: [PATCH 04/44] [php84] Fix some deprecations and lower requirements (#52636) * Fix implicit null types * Update some lower requirements * Fix typo * More lower version constraints * More lower version constraints * For now only run lowest strategy * Adjust PHPunit version * Adjust carbon requirement * Add phpunit 10 again * Fix phpunit annotations * Add prefer-stable again, disable fail-fast * Allow cli-parser 2.0.1 for phpunit 10 * Escape pipe --- .github/workflows/tests.yml | 11 +++++++++-- src/Illuminate/Support/ValidatedInput.php | 6 +++--- tests/Bus/QueueableTest.php | 17 +++++------------ 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6674abb44d4e..de00ae343754 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -37,10 +37,10 @@ jobs: - 8888:8000 strategy: - fail-fast: true + # fail-fast: true matrix: php: [8.4] - phpunit: ['10.5', '11.0.1'] + phpunit: ['10.5.12', '11.3.2'] stability: [prefer-lowest, prefer-stable] name: PHP ${{ matrix.php }} - PHPUnit ${{ matrix.phpunit }} - ${{ matrix.stability }} @@ -71,6 +71,13 @@ jobs: max_attempts: 5 command: composer require guzzlehttp/psr7:^2.4 --no-interaction --no-update + - name: Set minimum PHP 8.4 versions + uses: nick-fields/retry@v3 + with: + timeout_minutes: 5 + max_attempts: 5 + command: composer require guzzlehttp/promises:^2.0.3 mockery/mockery:^1.6.10 symfony/http-foundation:^7.1.3 symfony/translation:^7.1.3 symfony/console:^7.1.3 sebastian/cli-parser:^2.0.1\|^3.0.1 nesbot/carbon:^3.4.0 sebastian/exporter:^6.0.1 --no-interaction --no-update + - name: Set PHPUnit uses: nick-fields/retry@v3 with: diff --git a/src/Illuminate/Support/ValidatedInput.php b/src/Illuminate/Support/ValidatedInput.php index 05d962681287..d272d7710e9f 100644 --- a/src/Illuminate/Support/ValidatedInput.php +++ b/src/Illuminate/Support/ValidatedInput.php @@ -93,7 +93,7 @@ public function missing($keys) * @param callable|null $default * @return $this|mixed */ - public function whenMissing($key, callable $callback, callable $default = null) + public function whenMissing($key, callable $callback, ?callable $default = null) { if ($this->missing($key)) { return $callback(data_get($this->all(), $key)) ?: $this; @@ -212,7 +212,7 @@ public function all() * @param callable|null $default * @return $this|mixed */ - public function whenHas($key, callable $callback, callable $default = null) + public function whenHas($key, callable $callback, ?callable $default = null) { if ($this->has($key)) { return $callback(data_get($this->all(), $key)) ?: $this; @@ -290,7 +290,7 @@ public function anyFilled($keys) * @param callable|null $default * @return $this|mixed */ - public function whenFilled($key, callable $callback, callable $default = null) + public function whenFilled($key, callable $callback, ?callable $default = null) { if ($this->filled($key)) { return $callback(data_get($this->all(), $key)) ?: $this; diff --git a/tests/Bus/QueueableTest.php b/tests/Bus/QueueableTest.php index a9026bca70e8..ab2e161cb8fa 100644 --- a/tests/Bus/QueueableTest.php +++ b/tests/Bus/QueueableTest.php @@ -3,6 +3,7 @@ namespace Illuminate\Tests\Bus; use Illuminate\Bus\Queueable; +use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\TestCase; class QueueableTest extends TestCase @@ -17,9 +18,7 @@ public static function connectionDataProvider(): array ]; } - /** - * @dataProvider connectionDataProvider - */ + #[DataProvider('connectionDataProvider')] public function testOnConnection(mixed $connection, ?string $expected): void { $job = new FakeJob(); @@ -28,9 +27,7 @@ public function testOnConnection(mixed $connection, ?string $expected): void $this->assertSame($job->connection, $expected); } - /** - * @dataProvider connectionDataProvider - */ + #[DataProvider('connectionDataProvider')] public function testAllOnConnection(mixed $connection, ?string $expected): void { $job = new FakeJob(); @@ -50,9 +47,7 @@ public static function queuesDataProvider(): array ]; } - /** - * @dataProvider queuesDataProvider - */ + #[DataProvider('queuesDataProvider')] public function testOnQueue(mixed $queue, ?string $expected): void { $job = new FakeJob(); @@ -61,9 +56,7 @@ public function testOnQueue(mixed $queue, ?string $expected): void $this->assertSame($job->queue, $expected); } - /** - * @dataProvider queuesDataProvider - */ + #[DataProvider('queuesDataProvider')] public function testAllOnQueue(mixed $queue, ?string $expected): void { $job = new FakeJob(); From a156002ca5c2720e9080c287c577d8e9b7ec6bc8 Mon Sep 17 00:00:00 2001 From: Julius Kiekbusch Date: Thu, 5 Sep 2024 09:42:28 +0200 Subject: [PATCH 05/44] [php84] Update dependencies (#52637) * Update sebastian/exporter * Update dependencies for PHP 8.4 * Update dependencies for PHP 8.4 * Update dependencies for PHP 8.4 * run both phpunits version on lowest and stable again * Disable fail-fast * Update required predis/predis * Bump vlucas/phpdotenv * bump guzzlehttp/promises * Bump league/flysystem * wip * wip * wip --------- Co-authored-by: Dries Vints --- .github/workflows/tests.yml | 4 +- composer.json | 66 ++++++++++++------------- src/Illuminate/Console/composer.json | 6 +-- src/Illuminate/Cookie/composer.json | 4 +- src/Illuminate/Filesystem/composer.json | 10 ++-- src/Illuminate/Http/composer.json | 10 ++-- src/Illuminate/Mail/composer.json | 2 +- src/Illuminate/Process/composer.json | 2 +- src/Illuminate/Queue/composer.json | 2 +- src/Illuminate/Redis/composer.json | 2 +- src/Illuminate/Routing/composer.json | 6 +-- src/Illuminate/Session/composer.json | 4 +- src/Illuminate/Support/composer.json | 4 +- src/Illuminate/Validation/composer.json | 4 +- 14 files changed, 63 insertions(+), 63 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index de00ae343754..05c69d02540a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -37,7 +37,7 @@ jobs: - 8888:8000 strategy: - # fail-fast: true + fail-fast: false matrix: php: [8.4] phpunit: ['10.5.12', '11.3.2'] @@ -76,7 +76,7 @@ jobs: with: timeout_minutes: 5 max_attempts: 5 - command: composer require guzzlehttp/promises:^2.0.3 mockery/mockery:^1.6.10 symfony/http-foundation:^7.1.3 symfony/translation:^7.1.3 symfony/console:^7.1.3 sebastian/cli-parser:^2.0.1\|^3.0.1 nesbot/carbon:^3.4.0 sebastian/exporter:^6.0.1 --no-interaction --no-update + command: composer require nesbot/carbon:^3.4 guzzlehttp/promises:^2.0.3 --no-interaction --no-update - name: Set PHPUnit uses: nick-fields/retry@v3 diff --git a/composer.json b/composer.json index 6d0549c944f6..157f1489d0c8 100644 --- a/composer.json +++ b/composer.json @@ -29,33 +29,33 @@ "dragonmantank/cron-expression": "^3.3.2", "egulias/email-validator": "^3.2.1|^4.0", "fruitcake/php-cors": "^1.3", - "guzzlehttp/guzzle": "^7.8", + "guzzlehttp/guzzle": "^7.8.2", "guzzlehttp/uri-template": "^1.0", "laravel/prompts": "^0.1.18", "laravel/serializable-closure": "^1.3", "league/commonmark": "^2.2.1", - "league/flysystem": "^3.8.0", + "league/flysystem": "^3.25.1", "monolog/monolog": "^3.0", - "nesbot/carbon": "^2.72.2|^3.0", + "nesbot/carbon": "^2.72.2|^3.4", "nunomaduro/termwind": "^2.0", "psr/container": "^1.1.1|^2.0.1", "psr/log": "^1.0|^2.0|^3.0", "psr/simple-cache": "^1.0|^2.0|^3.0", "ramsey/uuid": "^4.7", - "symfony/console": "^7.0", - "symfony/error-handler": "^7.0", - "symfony/finder": "^7.0", - "symfony/http-foundation": "^7.0", - "symfony/http-kernel": "^7.0", - "symfony/mailer": "^7.0", - "symfony/mime": "^7.0", - "symfony/polyfill-php83": "^1.28", - "symfony/process": "^7.0", - "symfony/routing": "^7.0", - "symfony/uid": "^7.0", - "symfony/var-dumper": "^7.0", + "symfony/console": "^7.1.3", + "symfony/error-handler": "^7.1", + "symfony/finder": "^7.1", + "symfony/http-foundation": "^7.1.3", + "symfony/http-kernel": "^7.1", + "symfony/mailer": "^7.1", + "symfony/mime": "^7.1", + "symfony/polyfill-php83": "^1.30", + "symfony/process": "^7.1", + "symfony/routing": "^7.1", + "symfony/uid": "^7.1", + "symfony/var-dumper": "^7.1", "tijsverkoyen/css-to-inline-styles": "^2.2.5", - "vlucas/phpdotenv": "^5.4.1", + "vlucas/phpdotenv": "^5.6.1", "voku/portable-ascii": "^2.0" }, "replace": { @@ -99,22 +99,22 @@ "ably/ably-php": "^1.0", "aws/aws-sdk-php": "^3.235.5", "fakerphp/faker": "^1.23", - "league/flysystem-aws-s3-v3": "^3.0", - "league/flysystem-ftp": "^3.0", - "league/flysystem-path-prefixing": "^3.3", - "league/flysystem-read-only": "^3.3", - "league/flysystem-sftp-v3": "^3.0", - "mockery/mockery": "^1.6", + "league/flysystem-aws-s3-v3": "^3.25.1", + "league/flysystem-ftp": "^3.25.1", + "league/flysystem-path-prefixing": "^3.25.1", + "league/flysystem-read-only": "^3.25.1", + "league/flysystem-sftp-v3": "^3.25.1", + "mockery/mockery": "^1.6.10", "nyholm/psr7": "^1.2", "orchestra/testbench-core": "^9.1.5", "pda/pheanstalk": "^5.0", "phpstan/phpstan": "^1.11.5", - "phpunit/phpunit": "^10.5|^11.0", - "predis/predis": "^2.0.2", + "phpunit/phpunit": "^10.5.12|^11.3.2", + "predis/predis": "^2.2.0", "resend/resend-php": "^0.10.0", - "symfony/cache": "^7.0", - "symfony/http-client": "^7.0", - "symfony/psr-http-message-bridge": "^7.0", + "symfony/cache": "^7.1", + "symfony/http-client": "^7.1", + "symfony/psr-http-message-bridge": "^7.1", "nette/schema": "dev-master as v1.3.0" }, "conflict": { @@ -172,16 +172,16 @@ "fakerphp/faker": "Required to use the eloquent factory builder (^1.9.1).", "filp/whoops": "Required for friendly error pages in development (^2.14.3).", "laravel/tinker": "Required to use the tinker console command (^2.0).", - "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^3.0).", - "league/flysystem-ftp": "Required to use the Flysystem FTP driver (^3.0).", - "league/flysystem-path-prefixing": "Required to use the scoped driver (^3.3).", - "league/flysystem-read-only": "Required to use read-only disks (^3.3)", - "league/flysystem-sftp-v3": "Required to use the Flysystem SFTP driver (^3.0).", + "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^3.25.1).", + "league/flysystem-ftp": "Required to use the Flysystem FTP driver (^3.25.1).", + "league/flysystem-path-prefixing": "Required to use the scoped driver (^3.25.1).", + "league/flysystem-read-only": "Required to use read-only disks (^3.25.1)", + "league/flysystem-sftp-v3": "Required to use the Flysystem SFTP driver (^3.25.1).", "mockery/mockery": "Required to use mocking (^1.6).", "nyholm/psr7": "Required to use PSR-7 bridging features (^1.2).", "pda/pheanstalk": "Required to use the beanstalk queue driver (^5.0).", "phpunit/phpunit": "Required to use assertions and run tests (^10.5|^11.0).", - "predis/predis": "Required to use the predis connector (^2.0.2).", + "predis/predis": "Required to use the predis connector (^2.2.0).", "psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).", "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^6.0|^7.0).", "resend/resend-php": "Required to enable support for the Resend mail transport (^0.10.0).", diff --git a/src/Illuminate/Console/composer.json b/src/Illuminate/Console/composer.json index 6284998cd1d9..ae3bcd3ed566 100755 --- a/src/Illuminate/Console/composer.json +++ b/src/Illuminate/Console/composer.json @@ -23,9 +23,9 @@ "illuminate/view": "^11.0", "laravel/prompts": "^0.1.12", "nunomaduro/termwind": "^2.0", - "symfony/console": "^7.0", - "symfony/polyfill-php83": "^1.28", - "symfony/process": "^7.0" + "symfony/console": "^7.1.3", + "symfony/polyfill-php83": "^1.30", + "symfony/process": "^7.1" }, "autoload": { "psr-4": { diff --git a/src/Illuminate/Cookie/composer.json b/src/Illuminate/Cookie/composer.json index e8514738ce54..cb0074046605 100755 --- a/src/Illuminate/Cookie/composer.json +++ b/src/Illuminate/Cookie/composer.json @@ -20,8 +20,8 @@ "illuminate/contracts": "^11.0", "illuminate/macroable": "^11.0", "illuminate/support": "^11.0", - "symfony/http-foundation": "^7.0", - "symfony/http-kernel": "^7.0" + "symfony/http-foundation": "^7.1.3", + "symfony/http-kernel": "^7.1" }, "autoload": { "psr-4": { diff --git a/src/Illuminate/Filesystem/composer.json b/src/Illuminate/Filesystem/composer.json index 95ee6851a485..b80c611d9b0d 100644 --- a/src/Illuminate/Filesystem/composer.json +++ b/src/Illuminate/Filesystem/composer.json @@ -19,7 +19,7 @@ "illuminate/contracts": "^11.0", "illuminate/macroable": "^11.0", "illuminate/support": "^11.0", - "symfony/finder": "^7.0" + "symfony/finder": "^7.1" }, "autoload": { "psr-4": { @@ -39,10 +39,10 @@ "ext-ftp": "Required to use the Flysystem FTP driver.", "ext-hash": "Required to use the Filesystem class.", "illuminate/http": "Required for handling uploaded files (^7.0).", - "league/flysystem": "Required to use the Flysystem local driver (^3.0.16).", - "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^3.0).", - "league/flysystem-ftp": "Required to use the Flysystem FTP driver (^3.0).", - "league/flysystem-sftp-v3": "Required to use the Flysystem SFTP driver (^3.0).", + "league/flysystem": "Required to use the Flysystem local driver (^3.25.1).", + "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^3.25.1).", + "league/flysystem-ftp": "Required to use the Flysystem FTP driver (^3.25.1).", + "league/flysystem-sftp-v3": "Required to use the Flysystem SFTP driver (^3.25.1).", "psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).", "symfony/filesystem": "Required to enable support for relative symbolic links (^7.0).", "symfony/mime": "Required to enable support for guessing extensions (^7.0)." diff --git a/src/Illuminate/Http/composer.json b/src/Illuminate/Http/composer.json index 9222aedd597b..0e8e8cbdcb40 100755 --- a/src/Illuminate/Http/composer.json +++ b/src/Illuminate/Http/composer.json @@ -17,16 +17,16 @@ "php": "^8.2", "ext-filter": "*", "fruitcake/php-cors": "^1.3", - "guzzlehttp/guzzle": "^7.8", + "guzzlehttp/guzzle": "^7.8.2", "guzzlehttp/uri-template": "^1.0", "illuminate/collections": "^11.0", "illuminate/macroable": "^11.0", "illuminate/session": "^11.0", "illuminate/support": "^11.0", - "symfony/http-foundation": "^7.0", - "symfony/http-kernel": "^7.0", - "symfony/polyfill-php83": "^1.28", - "symfony/mime": "^7.0" + "symfony/http-foundation": "^7.1.3", + "symfony/http-kernel": "^7.1", + "symfony/polyfill-php83": "^1.30", + "symfony/mime": "^7.1" }, "autoload": { "psr-4": { diff --git a/src/Illuminate/Mail/composer.json b/src/Illuminate/Mail/composer.json index cf00d7cc483c..9568bedfa91e 100755 --- a/src/Illuminate/Mail/composer.json +++ b/src/Illuminate/Mail/composer.json @@ -22,7 +22,7 @@ "illuminate/support": "^11.0", "league/commonmark": "^2.2", "psr/log": "^1.0|^2.0|^3.0", - "symfony/mailer": "^7.0", + "symfony/mailer": "^7.1", "tijsverkoyen/css-to-inline-styles": "^2.2.5" }, "autoload": { diff --git a/src/Illuminate/Process/composer.json b/src/Illuminate/Process/composer.json index 1fecb13ba822..6ca330b33266 100644 --- a/src/Illuminate/Process/composer.json +++ b/src/Illuminate/Process/composer.json @@ -19,7 +19,7 @@ "illuminate/contracts": "^11.0", "illuminate/macroable": "^11.0", "illuminate/support": "^11.0", - "symfony/process": "^7.0" + "symfony/process": "^7.1" }, "autoload": { "psr-4": { diff --git a/src/Illuminate/Queue/composer.json b/src/Illuminate/Queue/composer.json index 54fddacecb46..1459d34213ce 100644 --- a/src/Illuminate/Queue/composer.json +++ b/src/Illuminate/Queue/composer.json @@ -25,7 +25,7 @@ "illuminate/support": "^11.0", "laravel/serializable-closure": "^1.2.2", "ramsey/uuid": "^4.7", - "symfony/process": "^7.0" + "symfony/process": "^7.1" }, "autoload": { "psr-4": { diff --git a/src/Illuminate/Redis/composer.json b/src/Illuminate/Redis/composer.json index 643d294b78f6..5172ea812223 100755 --- a/src/Illuminate/Redis/composer.json +++ b/src/Illuminate/Redis/composer.json @@ -27,7 +27,7 @@ }, "suggest": { "ext-redis": "Required to use the phpredis connector (^4.0|^5.0|^6.0).", - "predis/predis": "Required to use the predis connector (^2.0.2)." + "predis/predis": "Required to use the predis connector (^2.2.0)." }, "extra": { "branch-alias": { diff --git a/src/Illuminate/Routing/composer.json b/src/Illuminate/Routing/composer.json index a9c4b8a78810..f8d1991293c1 100644 --- a/src/Illuminate/Routing/composer.json +++ b/src/Illuminate/Routing/composer.json @@ -25,9 +25,9 @@ "illuminate/pipeline": "^11.0", "illuminate/session": "^11.0", "illuminate/support": "^11.0", - "symfony/http-foundation": "^7.0", - "symfony/http-kernel": "^7.0", - "symfony/routing": "^7.0" + "symfony/http-foundation": "^7.1.3", + "symfony/http-kernel": "^7.1", + "symfony/routing": "^7.1" }, "autoload": { "psr-4": { diff --git a/src/Illuminate/Session/composer.json b/src/Illuminate/Session/composer.json index 56789edc0f78..7cd8ef7de71d 100755 --- a/src/Illuminate/Session/composer.json +++ b/src/Illuminate/Session/composer.json @@ -21,8 +21,8 @@ "illuminate/contracts": "^11.0", "illuminate/filesystem": "^11.0", "illuminate/support": "^11.0", - "symfony/finder": "^7.0", - "symfony/http-foundation": "^7.0" + "symfony/finder": "^7.1", + "symfony/http-foundation": "^7.1.3" }, "autoload": { "psr-4": { diff --git a/src/Illuminate/Support/composer.json b/src/Illuminate/Support/composer.json index 5be0cdb4c2d7..7e28842f55ce 100644 --- a/src/Illuminate/Support/composer.json +++ b/src/Illuminate/Support/composer.json @@ -23,7 +23,7 @@ "illuminate/conditionable": "^11.0", "illuminate/contracts": "^11.0", "illuminate/macroable": "^11.0", - "nesbot/carbon": "^2.72.2|^3.0", + "nesbot/carbon": "^2.72.2|^3.4", "voku/portable-ascii": "^2.0" }, "conflict": { @@ -52,7 +52,7 @@ "symfony/process": "Required to use the composer class (^7.0).", "symfony/uid": "Required to use Str::ulid() (^7.0).", "symfony/var-dumper": "Required to use the dd function (^7.0).", - "vlucas/phpdotenv": "Required to use the Env class and env helper (^5.4.1)." + "vlucas/phpdotenv": "Required to use the Env class and env helper (^5.6.1)." }, "config": { "sort-packages": true diff --git a/src/Illuminate/Validation/composer.json b/src/Illuminate/Validation/composer.json index ac4f997747a0..fe521898878f 100755 --- a/src/Illuminate/Validation/composer.json +++ b/src/Illuminate/Validation/composer.json @@ -25,8 +25,8 @@ "illuminate/macroable": "^11.0", "illuminate/support": "^11.0", "illuminate/translation": "^11.0", - "symfony/http-foundation": "^7.0", - "symfony/mime": "^7.0" + "symfony/http-foundation": "^7.1.3", + "symfony/mime": "^7.1" }, "autoload": { "psr-4": { From 995424c16e872403bda829de35cc438c8147648e Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Fri, 20 Sep 2024 08:35:04 +0800 Subject: [PATCH 06/44] wip Signed-off-by: Mior Muhammad Zaki --- .github/workflows/static-analysis.yml | 46 +++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 .github/workflows/static-analysis.yml diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml new file mode 100644 index 000000000000..0b49e1539d73 --- /dev/null +++ b/.github/workflows/static-analysis.yml @@ -0,0 +1,46 @@ +name: static analysis + +on: + push: + branches: + - master + - '*.x' + - '!php84' + pull_request: + branches-ignore: + - 'php84' + +jobs: + types: + runs-on: ubuntu-24.04 + + strategy: + fail-fast: true + matrix: + directory: [src, types] + + name: ${{ matrix.directory == 'src' && 'Source Code' || 'Types' }} + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: 8.2 + tools: composer:v2 + coverage: none + + - name: Set Framework version + run: composer config version "11.x-dev" + + - name: Install dependencies + uses: nick-fields/retry@v3 + with: + timeout_minutes: 5 + max_attempts: 5 + command: composer update --prefer-stable --prefer-dist --no-interaction --no-progress + + - name: Execute type checking + run: vendor/bin/phpstan --configuration="phpstan.${{ matrix.directory }}.neon.dist" From 826e344a04a1c98f04203e635fe98826573c6cb5 Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Fri, 20 Sep 2024 08:35:54 +0800 Subject: [PATCH 07/44] wip Signed-off-by: Mior Muhammad Zaki --- .github/workflows/queues.yml | 167 +++++++++++++++++++++++++++++++++++ 1 file changed, 167 insertions(+) create mode 100644 .github/workflows/queues.yml diff --git a/.github/workflows/queues.yml b/.github/workflows/queues.yml new file mode 100644 index 000000000000..b8ff7491cb1e --- /dev/null +++ b/.github/workflows/queues.yml @@ -0,0 +1,167 @@ +name: queues + +on: + push: + branches: + - master + - '*.x' + - '!php84' + pull_request: + branches-ignore: + - 'php84' + +jobs: + sync: + runs-on: ubuntu-24.04 + + strategy: + fail-fast: true + + name: Sync Driver + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: 8.2 + extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_mysql, :php-psr + tools: composer:v2 + coverage: none + + - name: Set Framework version + run: composer config version "11.x-dev" + + - name: Install dependencies + uses: nick-fields/retry@v3 + with: + timeout_minutes: 5 + max_attempts: 5 + command: composer update --prefer-stable --prefer-dist --no-interaction --no-progress + + - name: Execute tests + run: vendor/bin/phpunit tests/Integration/Queue + env: + QUEUE_CONNECTION: sync + + database: + runs-on: ubuntu-24.04 + + strategy: + fail-fast: true + + name: Database Driver + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: 8.2 + extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_mysql, :php-psr + tools: composer:v2 + coverage: none + + - name: Set Framework version + run: composer config version "11.x-dev" + + - name: Install dependencies + uses: nick-fields/retry@v3 + with: + timeout_minutes: 5 + max_attempts: 5 + command: composer update --prefer-stable --prefer-dist --no-interaction --no-progress + + - name: Execute tests + run: vendor/bin/phpunit tests/Integration/Queue + env: + DB_CONNECTION: testing + QUEUE_CONNECTION: database + + redis: + runs-on: ubuntu-24.04 + + services: + redis: + image: redis:7.0 + ports: + - 6379:6379 + options: --entrypoint redis-server + + strategy: + fail-fast: true + + name: Redis Driver + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: 8.2 + extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_mysql, :php-psr + tools: composer:v2 + coverage: none + + - name: Set Framework version + run: composer config version "11.x-dev" + + - name: Install dependencies + uses: nick-fields/retry@v3 + with: + timeout_minutes: 5 + max_attempts: 5 + command: composer update --prefer-stable --prefer-dist --no-interaction --no-progress + + - name: Execute tests + run: vendor/bin/phpunit tests/Integration/Queue + env: + QUEUE_CONNECTION: redis + + beanstalkd: + runs-on: ubuntu-24.04 + + name: Beanstalkd Driver + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Download & Extract beanstalkd + run: curl -L https://github.com/beanstalkd/beanstalkd/archive/refs/tags/v1.13.tar.gz | tar xz + + - name: Make beanstalkd + run: make + working-directory: beanstalkd-1.13 + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: 8.2 + extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_mysql, :php-psr + tools: composer:v2 + coverage: none + + - name: Set Framework version + run: composer config version "11.x-dev" + + - name: Install dependencies + uses: nick-fields/retry@v3 + with: + timeout_minutes: 5 + max_attempts: 5 + command: composer update --prefer-stable --prefer-dist --no-interaction --no-progress + + - name: Daemonize beanstalkd + run: ./beanstalkd-1.13/beanstalkd & + + - name: Execute tests + run: vendor/bin/phpunit tests/Integration/Queue + env: + QUEUE_CONNECTION: beanstalkd From 62dfb98519f57263ca2532caeea294c2a141e3a4 Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Fri, 20 Sep 2024 08:39:28 +0800 Subject: [PATCH 08/44] wip Signed-off-by: Mior Muhammad Zaki --- .github/workflows/databases.yml | 278 ++++++++++++++++++++++++++ .github/workflows/queues.yml | 15 +- .github/workflows/static-analysis.yml | 15 +- 3 files changed, 290 insertions(+), 18 deletions(-) create mode 100644 .github/workflows/databases.yml diff --git a/.github/workflows/databases.yml b/.github/workflows/databases.yml new file mode 100644 index 000000000000..9d417e776ac5 --- /dev/null +++ b/.github/workflows/databases.yml @@ -0,0 +1,278 @@ +name: databases + +# on: +# push: +# branches: +# - master +# - '*.x' +# pull_request: + +jobs: + mysql_57: + runs-on: ubuntu-24.04 + + services: + mysql: + image: mysql:5.7 + env: + MYSQL_ALLOW_EMPTY_PASSWORD: yes + MYSQL_DATABASE: laravel + ports: + - 3306:3306 + options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3 + + strategy: + fail-fast: true + + name: MySQL 5.7 + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: 8.2 + extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_mysql, :php-psr + tools: composer:v2 + coverage: none + + - name: Set Framework version + run: composer config version "11.x-dev" + + - name: Install dependencies + uses: nick-fields/retry@v3 + with: + timeout_minutes: 5 + max_attempts: 5 + command: composer update --prefer-stable --prefer-dist --no-interaction --no-progress + + - name: Execute tests + run: vendor/bin/phpunit tests/Integration/Database + env: + DB_CONNECTION: mysql + DB_COLLATION: utf8mb4_unicode_ci + + mysql_8: + runs-on: ubuntu-24.04 + + services: + mysql: + image: mysql:8 + env: + MYSQL_ALLOW_EMPTY_PASSWORD: yes + MYSQL_DATABASE: laravel + ports: + - 3306:3306 + options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3 + + strategy: + fail-fast: true + + name: MySQL 8 + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: 8.2 + extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_mysql, :php-psr + tools: composer:v2 + coverage: none + + - name: Set Framework version + run: composer config version "11.x-dev" + + - name: Install dependencies + uses: nick-fields/retry@v3 + with: + timeout_minutes: 5 + max_attempts: 5 + command: composer update --prefer-stable --prefer-dist --no-interaction --no-progress + + - name: Execute tests + run: vendor/bin/phpunit tests/Integration/Database + env: + DB_CONNECTION: mysql + + mariadb: + runs-on: ubuntu-24.04 + + services: + mariadb: + image: mariadb:10 + env: + MARIADB_ALLOW_EMPTY_ROOT_PASSWORD: yes + MARIADB_DATABASE: laravel + ports: + - 3306:3306 + options: --health-cmd="healthcheck.sh --connect --innodb_initialized" --health-interval=10s --health-timeout=5s --health-retries=3 + + strategy: + fail-fast: true + + name: MariaDB 10 + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: 8.2 + extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_mysql, :php-psr + tools: composer:v2 + coverage: none + + - name: Set Framework version + run: composer config version "11.x-dev" + + - name: Install dependencies + uses: nick-fields/retry@v3 + with: + timeout_minutes: 5 + max_attempts: 5 + command: composer update --prefer-stable --prefer-dist --no-interaction --no-progress + + - name: Execute tests + run: vendor/bin/phpunit tests/Integration/Database + env: + DB_CONNECTION: mariadb + + pgsql: + runs-on: ubuntu-24.04 + + services: + postgresql: + image: postgres:14 + env: + POSTGRES_DB: laravel + POSTGRES_USER: forge + POSTGRES_PASSWORD: password + ports: + - 5432:5432 + options: --health-cmd=pg_isready --health-interval=10s --health-timeout=5s --health-retries=3 + + strategy: + fail-fast: true + + name: PostgreSQL 14 + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: 8.2 + extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_pgsql, :php-psr + tools: composer:v2 + coverage: none + + - name: Set Framework version + run: composer config version "11.x-dev" + + - name: Install dependencies + uses: nick-fields/retry@v3 + with: + timeout_minutes: 5 + max_attempts: 5 + command: composer update --prefer-stable --prefer-dist --no-interaction --no-progress + + - name: Execute tests + run: vendor/bin/phpunit tests/Integration/Database + env: + DB_CONNECTION: pgsql + DB_USERNAME: forge + DB_PASSWORD: password + + mssql: + runs-on: ubuntu-22.04 + + services: + sqlsrv: + image: mcr.microsoft.com/mssql/server:2019-latest + env: + ACCEPT_EULA: Y + SA_PASSWORD: Forge123 + ports: + - 1433:1433 + + strategy: + fail-fast: true + + name: SQL Server 2019 + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: 8.2 + extensions: dom, curl, libxml, mbstring, zip, pcntl, sqlsrv, pdo, pdo_sqlsrv, odbc, pdo_odbc, :php-psr + tools: composer:v2 + coverage: none + + - name: Set Framework version + run: composer config version "11.x-dev" + + - name: Install dependencies + uses: nick-fields/retry@v3 + with: + timeout_minutes: 5 + max_attempts: 5 + command: composer update --prefer-stable --prefer-dist --no-interaction --no-progress + + - name: Execute tests + run: vendor/bin/phpunit tests/Integration/Database + env: + DB_CONNECTION: sqlsrv + DB_DATABASE: master + DB_USERNAME: SA + DB_PASSWORD: Forge123 + + sqlite: + runs-on: ubuntu-24.04 + + strategy: + fail-fast: true + + name: SQLite + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: 8.2 + extensions: dom, curl, libxml, mbstring, zip, pcntl, sqlsrv, pdo, pdo_sqlsrv, odbc, pdo_odbc, :php-psr + tools: composer:v2 + coverage: none + + - name: Set Framework version + run: composer config version "11.x-dev" + + - name: Install dependencies + uses: nick-fields/retry@v3 + with: + timeout_minutes: 5 + max_attempts: 5 + command: composer update --prefer-stable --prefer-dist --no-interaction --no-progress + + - name: Setup SQLite Database + run: php vendor/bin/testbench package:create-sqlite-db + + - name: Execute tests + run: vendor/bin/phpunit tests/Integration/Database/Sqlite + env: + DB_CONNECTION: sqlite diff --git a/.github/workflows/queues.yml b/.github/workflows/queues.yml index b8ff7491cb1e..d929a14865c2 100644 --- a/.github/workflows/queues.yml +++ b/.github/workflows/queues.yml @@ -1,14 +1,11 @@ name: queues -on: - push: - branches: - - master - - '*.x' - - '!php84' - pull_request: - branches-ignore: - - 'php84' +# on: +# push: +# branches: +# - master +# - '*.x' +# pull_request: jobs: sync: diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index 0b49e1539d73..bfa14c24f5cd 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -1,14 +1,11 @@ name: static analysis -on: - push: - branches: - - master - - '*.x' - - '!php84' - pull_request: - branches-ignore: - - 'php84' +# on: +# push: +# branches: +# - master +# - '*.x' +# pull_request: jobs: types: From 89b2d855acf7e8b00ddf8d7de3b9412ee4460c31 Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Fri, 20 Sep 2024 08:41:49 +0800 Subject: [PATCH 09/44] wip Signed-off-by: Mior Muhammad Zaki --- .github/workflows/databases.yml | 2 +- .github/workflows/queues.yml | 2 +- .github/workflows/static-analysis.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/databases.yml b/.github/workflows/databases.yml index 9d417e776ac5..a16407c236c9 100644 --- a/.github/workflows/databases.yml +++ b/.github/workflows/databases.yml @@ -1,6 +1,6 @@ name: databases -# on: +on: # push: # branches: # - master diff --git a/.github/workflows/queues.yml b/.github/workflows/queues.yml index d929a14865c2..d1514ee6ced2 100644 --- a/.github/workflows/queues.yml +++ b/.github/workflows/queues.yml @@ -1,6 +1,6 @@ name: queues -# on: +on: # push: # branches: # - master diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index bfa14c24f5cd..7d75aa8b01ec 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -1,6 +1,6 @@ name: static analysis -# on: +on: # push: # branches: # - master From ee12b1fd1e96a7e608841fa1e720cfbe58eba36e Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Fri, 20 Sep 2024 08:44:13 +0800 Subject: [PATCH 10/44] wip Signed-off-by: Mior Muhammad Zaki --- .github/workflows/databases.yml | 8 ++++---- .github/workflows/queues.yml | 8 ++++---- .github/workflows/static-analysis.yml | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/databases.yml b/.github/workflows/databases.yml index a16407c236c9..55fd1f4a6199 100644 --- a/.github/workflows/databases.yml +++ b/.github/workflows/databases.yml @@ -1,10 +1,10 @@ name: databases on: -# push: -# branches: -# - master -# - '*.x' + push: + branches: + - master + - '*.x' # pull_request: jobs: diff --git a/.github/workflows/queues.yml b/.github/workflows/queues.yml index d1514ee6ced2..55bc252ebe8b 100644 --- a/.github/workflows/queues.yml +++ b/.github/workflows/queues.yml @@ -1,10 +1,10 @@ name: queues on: -# push: -# branches: -# - master -# - '*.x' + push: + branches: + - master + - '*.x' # pull_request: jobs: diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index 7d75aa8b01ec..bab990ea7ae1 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -1,10 +1,10 @@ name: static analysis on: -# push: -# branches: -# - master -# - '*.x' + push: + branches: + - master + - '*.x' # pull_request: jobs: From 1c9430cf1b58934b3b3d81a23c1bcee43b90c525 Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Fri, 20 Sep 2024 09:38:30 +0800 Subject: [PATCH 11/44] wip Signed-off-by: Mior Muhammad Zaki --- .github/workflows/databases.yml | 2 +- .github/workflows/queues.yml | 2 +- .github/workflows/static-analysis.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/databases.yml b/.github/workflows/databases.yml index 55fd1f4a6199..f9d387b11601 100644 --- a/.github/workflows/databases.yml +++ b/.github/workflows/databases.yml @@ -5,7 +5,7 @@ on: branches: - master - '*.x' -# pull_request: + pull_request: jobs: mysql_57: diff --git a/.github/workflows/queues.yml b/.github/workflows/queues.yml index 55bc252ebe8b..0c2ee8310a06 100644 --- a/.github/workflows/queues.yml +++ b/.github/workflows/queues.yml @@ -5,7 +5,7 @@ on: branches: - master - '*.x' -# pull_request: + pull_request: jobs: sync: diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index bab990ea7ae1..8fba837d50a8 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -5,7 +5,7 @@ on: branches: - master - '*.x' -# pull_request: + pull_request: jobs: types: From 3ae016e9e4a6a2a2bd8b8a8aaaec27429c429ec0 Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Fri, 20 Sep 2024 09:40:10 +0800 Subject: [PATCH 12/44] wip Signed-off-by: Mior Muhammad Zaki --- .github/workflows/databases-nightly.yml | 98 +++++++++++++++++++++++++ .github/workflows/static-analysis.yml | 2 +- 2 files changed, 99 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/databases-nightly.yml diff --git a/.github/workflows/databases-nightly.yml b/.github/workflows/databases-nightly.yml new file mode 100644 index 000000000000..775e1d85e494 --- /dev/null +++ b/.github/workflows/databases-nightly.yml @@ -0,0 +1,98 @@ +name: databases-nightly + +on: + workflow_dispatch: + # schedule: + # - cron: '0 0 * * *' + +jobs: + mysql_9: + runs-on: ubuntu-24.04 + + services: + mysql: + image: mysql:9 + env: + MYSQL_ALLOW_EMPTY_PASSWORD: yes + MYSQL_DATABASE: laravel + ports: + - 3306:3306 + options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3 + + strategy: + fail-fast: true + + name: MySQL 9 + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: 8.2 + extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_mysql, :php-psr + tools: composer:v2 + coverage: none + + - name: Set Framework version + run: composer config version "11.x-dev" + + - name: Install dependencies + uses: nick-fields/retry@v3 + with: + timeout_minutes: 5 + max_attempts: 5 + command: composer update --prefer-stable --prefer-dist --no-interaction --no-progress + + - name: Execute tests + run: vendor/bin/phpunit tests/Integration/Database + env: + DB_CONNECTION: mysql + + mariadb: + runs-on: ubuntu-24.04 + continue-on-error: true + + services: + mariadb: + image: quay.io/mariadb-foundation/mariadb-devel:verylatest + env: + MARIADB_ALLOW_EMPTY_ROOT_PASSWORD: yes + MARIADB_DATABASE: laravel + ports: + - 3306:3306 + options: --health-cmd="healthcheck.sh --connect --innodb_initialized" --health-interval=10s --health-timeout=5s --health-retries=3 + + strategy: + fail-fast: true + + name: MariaDB Very Latest + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: 8.2 + extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_mysql, :php-psr + tools: composer:v2 + coverage: none + + - name: Set Framework version + run: composer config version "11.x-dev" + + - name: Install dependencies + uses: nick-fields/retry@v3 + with: + timeout_minutes: 5 + max_attempts: 5 + command: composer update --prefer-stable --prefer-dist --no-interaction --no-progress + + - name: Execute tests + run: vendor/bin/phpunit tests/Integration/Database + env: + DB_CONNECTION: mariadb diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index 8fba837d50a8..76e5aa646e7f 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -5,7 +5,7 @@ on: branches: - master - '*.x' - pull_request: + pull_request: jobs: types: From 1c52908c453e337d192b4cf1f9422fb8197c77ff Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Fri, 20 Sep 2024 22:32:42 +0800 Subject: [PATCH 13/44] wip Signed-off-by: Mior Muhammad Zaki --- composer.json | 28 ++++++++++++------------ src/Illuminate/Cache/composer.json | 2 +- src/Illuminate/Collections/composer.json | 2 +- src/Illuminate/Console/composer.json | 4 ++-- src/Illuminate/Cookie/composer.json | 4 ++-- src/Illuminate/Database/composer.json | 2 +- src/Illuminate/Filesystem/composer.json | 6 ++--- src/Illuminate/Http/composer.json | 6 ++--- src/Illuminate/Mail/composer.json | 8 +++---- src/Illuminate/Process/composer.json | 2 +- src/Illuminate/Queue/composer.json | 2 +- src/Illuminate/Routing/composer.json | 8 +++---- src/Illuminate/Session/composer.json | 4 ++-- src/Illuminate/Support/composer.json | 6 ++--- src/Illuminate/Validation/composer.json | 4 ++-- 15 files changed, 44 insertions(+), 44 deletions(-) diff --git a/composer.json b/composer.json index 157f1489d0c8..9e98c5fa520e 100644 --- a/composer.json +++ b/composer.json @@ -42,18 +42,18 @@ "psr/log": "^1.0|^2.0|^3.0", "psr/simple-cache": "^1.0|^2.0|^3.0", "ramsey/uuid": "^4.7", - "symfony/console": "^7.1.3", - "symfony/error-handler": "^7.1", - "symfony/finder": "^7.1", - "symfony/http-foundation": "^7.1.3", - "symfony/http-kernel": "^7.1", - "symfony/mailer": "^7.1", - "symfony/mime": "^7.1", + "symfony/console": "^7.1.4", + "symfony/error-handler": "^7.1.4", + "symfony/finder": "^7.1.4", + "symfony/http-foundation": "^7.1.4", + "symfony/http-kernel": "^7.1.4", + "symfony/mailer": "^7.1.4", + "symfony/mime": "^7.1.4", "symfony/polyfill-php83": "^1.30", - "symfony/process": "^7.1", - "symfony/routing": "^7.1", - "symfony/uid": "^7.1", - "symfony/var-dumper": "^7.1", + "symfony/process": "^7.1.4", + "symfony/routing": "^7.1.4", + "symfony/uid": "^7.1.4", + "symfony/var-dumper": "^7.1.4", "tijsverkoyen/css-to-inline-styles": "^2.2.5", "vlucas/phpdotenv": "^5.6.1", "voku/portable-ascii": "^2.0" @@ -112,9 +112,9 @@ "phpunit/phpunit": "^10.5.12|^11.3.2", "predis/predis": "^2.2.0", "resend/resend-php": "^0.10.0", - "symfony/cache": "^7.1", - "symfony/http-client": "^7.1", - "symfony/psr-http-message-bridge": "^7.1", + "symfony/cache": "^7.1.4", + "symfony/http-client": "^7.1.4", + "symfony/psr-http-message-bridge": "^7.1.4", "nette/schema": "dev-master as v1.3.0" }, "conflict": { diff --git a/src/Illuminate/Cache/composer.json b/src/Illuminate/Cache/composer.json index ec0d26e18469..37954fc0a4f5 100755 --- a/src/Illuminate/Cache/composer.json +++ b/src/Illuminate/Cache/composer.json @@ -40,7 +40,7 @@ "illuminate/database": "Required to use the database cache driver (^11.0).", "illuminate/filesystem": "Required to use the file cache driver (^11.0).", "illuminate/redis": "Required to use the redis cache driver (^11.0).", - "symfony/cache": "Required to use PSR-6 cache bridge (^7.0)." + "symfony/cache": "Required to use PSR-6 cache bridge (^7.1.4)." }, "config": { "sort-packages": true diff --git a/src/Illuminate/Collections/composer.json b/src/Illuminate/Collections/composer.json index 1924032ab915..d2a6116ca585 100644 --- a/src/Illuminate/Collections/composer.json +++ b/src/Illuminate/Collections/composer.json @@ -33,7 +33,7 @@ } }, "suggest": { - "symfony/var-dumper": "Required to use the dump method (^7.0)." + "symfony/var-dumper": "Required to use the dump method (^7.1.4)." }, "config": { "sort-packages": true diff --git a/src/Illuminate/Console/composer.json b/src/Illuminate/Console/composer.json index ae3bcd3ed566..aee202a2391c 100755 --- a/src/Illuminate/Console/composer.json +++ b/src/Illuminate/Console/composer.json @@ -23,9 +23,9 @@ "illuminate/view": "^11.0", "laravel/prompts": "^0.1.12", "nunomaduro/termwind": "^2.0", - "symfony/console": "^7.1.3", + "symfony/console": "^7.1.4", "symfony/polyfill-php83": "^1.30", - "symfony/process": "^7.1" + "symfony/process": "^7.1.4" }, "autoload": { "psr-4": { diff --git a/src/Illuminate/Cookie/composer.json b/src/Illuminate/Cookie/composer.json index cb0074046605..5e1be3be799c 100755 --- a/src/Illuminate/Cookie/composer.json +++ b/src/Illuminate/Cookie/composer.json @@ -20,8 +20,8 @@ "illuminate/contracts": "^11.0", "illuminate/macroable": "^11.0", "illuminate/support": "^11.0", - "symfony/http-foundation": "^7.1.3", - "symfony/http-kernel": "^7.1" + "symfony/http-foundation": "^7.1.4", + "symfony/http-kernel": "^7.1.4" }, "autoload": { "psr-4": { diff --git a/src/Illuminate/Database/composer.json b/src/Illuminate/Database/composer.json index bcbb837c0818..67a9cef2e5f2 100644 --- a/src/Illuminate/Database/composer.json +++ b/src/Illuminate/Database/composer.json @@ -41,7 +41,7 @@ "illuminate/events": "Required to use the observers with Eloquent (^11.0).", "illuminate/filesystem": "Required to use the migrations (^11.0).", "illuminate/pagination": "Required to paginate the result set (^11.0).", - "symfony/finder": "Required to use Eloquent model factories (^7.0)." + "symfony/finder": "Required to use Eloquent model factories (^7.1.4)." }, "config": { "sort-packages": true diff --git a/src/Illuminate/Filesystem/composer.json b/src/Illuminate/Filesystem/composer.json index b80c611d9b0d..ed17f52cff5d 100644 --- a/src/Illuminate/Filesystem/composer.json +++ b/src/Illuminate/Filesystem/composer.json @@ -19,7 +19,7 @@ "illuminate/contracts": "^11.0", "illuminate/macroable": "^11.0", "illuminate/support": "^11.0", - "symfony/finder": "^7.1" + "symfony/finder": "^7.1.4" }, "autoload": { "psr-4": { @@ -44,8 +44,8 @@ "league/flysystem-ftp": "Required to use the Flysystem FTP driver (^3.25.1).", "league/flysystem-sftp-v3": "Required to use the Flysystem SFTP driver (^3.25.1).", "psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).", - "symfony/filesystem": "Required to enable support for relative symbolic links (^7.0).", - "symfony/mime": "Required to enable support for guessing extensions (^7.0)." + "symfony/filesystem": "Required to enable support for relative symbolic links (^7.1.4).", + "symfony/mime": "Required to enable support for guessing extensions (^7.1.4)." }, "config": { "sort-packages": true diff --git a/src/Illuminate/Http/composer.json b/src/Illuminate/Http/composer.json index 0e8e8cbdcb40..5bfd2e3ed5ad 100755 --- a/src/Illuminate/Http/composer.json +++ b/src/Illuminate/Http/composer.json @@ -23,10 +23,10 @@ "illuminate/macroable": "^11.0", "illuminate/session": "^11.0", "illuminate/support": "^11.0", - "symfony/http-foundation": "^7.1.3", - "symfony/http-kernel": "^7.1", + "symfony/http-foundation": "^7.1.4", + "symfony/http-kernel": "^7.1.4", "symfony/polyfill-php83": "^1.30", - "symfony/mime": "^7.1" + "symfony/mime": "^7.1.4" }, "autoload": { "psr-4": { diff --git a/src/Illuminate/Mail/composer.json b/src/Illuminate/Mail/composer.json index 9568bedfa91e..6068be3cf7b7 100755 --- a/src/Illuminate/Mail/composer.json +++ b/src/Illuminate/Mail/composer.json @@ -22,7 +22,7 @@ "illuminate/support": "^11.0", "league/commonmark": "^2.2", "psr/log": "^1.0|^2.0|^3.0", - "symfony/mailer": "^7.1", + "symfony/mailer": "^7.1.4", "tijsverkoyen/css-to-inline-styles": "^2.2.5" }, "autoload": { @@ -38,9 +38,9 @@ "suggest": { "aws/aws-sdk-php": "Required to use the SES mail driver (^3.235.5).", "resend/resend-php": "Required to enable support for the Resend mail transport (^0.10.0).", - "symfony/http-client": "Required to use the Symfony API mail transports (^7.0).", - "symfony/mailgun-mailer": "Required to enable support for the Mailgun mail transport (^7.0).", - "symfony/postmark-mailer": "Required to enable support for the Postmark mail transport (^7.0)." + "symfony/http-client": "Required to use the Symfony API mail transports (^7.1.4).", + "symfony/mailgun-mailer": "Required to enable support for the Mailgun mail transport (^7.1.4).", + "symfony/postmark-mailer": "Required to enable support for the Postmark mail transport (^7.1.4)." }, "config": { "sort-packages": true diff --git a/src/Illuminate/Process/composer.json b/src/Illuminate/Process/composer.json index 6ca330b33266..c563e10bfb05 100644 --- a/src/Illuminate/Process/composer.json +++ b/src/Illuminate/Process/composer.json @@ -19,7 +19,7 @@ "illuminate/contracts": "^11.0", "illuminate/macroable": "^11.0", "illuminate/support": "^11.0", - "symfony/process": "^7.1" + "symfony/process": "^7.1.4" }, "autoload": { "psr-4": { diff --git a/src/Illuminate/Queue/composer.json b/src/Illuminate/Queue/composer.json index 1459d34213ce..ee41c5f03ebe 100644 --- a/src/Illuminate/Queue/composer.json +++ b/src/Illuminate/Queue/composer.json @@ -25,7 +25,7 @@ "illuminate/support": "^11.0", "laravel/serializable-closure": "^1.2.2", "ramsey/uuid": "^4.7", - "symfony/process": "^7.1" + "symfony/process": "^7.1.4" }, "autoload": { "psr-4": { diff --git a/src/Illuminate/Routing/composer.json b/src/Illuminate/Routing/composer.json index f8d1991293c1..39f7381dc7c7 100644 --- a/src/Illuminate/Routing/composer.json +++ b/src/Illuminate/Routing/composer.json @@ -25,9 +25,9 @@ "illuminate/pipeline": "^11.0", "illuminate/session": "^11.0", "illuminate/support": "^11.0", - "symfony/http-foundation": "^7.1.3", - "symfony/http-kernel": "^7.1", - "symfony/routing": "^7.1" + "symfony/http-foundation": "^7.1.4", + "symfony/http-kernel": "^7.1.4", + "symfony/routing": "^7.1.4" }, "autoload": { "psr-4": { @@ -42,7 +42,7 @@ "suggest": { "illuminate/console": "Required to use the make commands (^11.0).", "nyholm/psr7": "Required to use PSR-7 bridging features (^1.2).", - "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^7.0)." + "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^7.1.4)." }, "config": { "sort-packages": true diff --git a/src/Illuminate/Session/composer.json b/src/Illuminate/Session/composer.json index 7cd8ef7de71d..e291f3755e6b 100755 --- a/src/Illuminate/Session/composer.json +++ b/src/Illuminate/Session/composer.json @@ -21,8 +21,8 @@ "illuminate/contracts": "^11.0", "illuminate/filesystem": "^11.0", "illuminate/support": "^11.0", - "symfony/finder": "^7.1", - "symfony/http-foundation": "^7.1.3" + "symfony/finder": "^7.1.4", + "symfony/http-foundation": "^7.1.4" }, "autoload": { "psr-4": { diff --git a/src/Illuminate/Support/composer.json b/src/Illuminate/Support/composer.json index 7e28842f55ce..d3b861507719 100644 --- a/src/Illuminate/Support/composer.json +++ b/src/Illuminate/Support/composer.json @@ -49,9 +49,9 @@ "illuminate/filesystem": "Required to use the composer class (^11.0).", "league/commonmark": "Required to use Str::markdown() and Stringable::markdown() (^2.0.2).", "ramsey/uuid": "Required to use Str::uuid() (^4.7).", - "symfony/process": "Required to use the composer class (^7.0).", - "symfony/uid": "Required to use Str::ulid() (^7.0).", - "symfony/var-dumper": "Required to use the dd function (^7.0).", + "symfony/process": "Required to use the composer class (^7.1.4).", + "symfony/uid": "Required to use Str::ulid() (^7.1.4).", + "symfony/var-dumper": "Required to use the dd function (^7.1.4).", "vlucas/phpdotenv": "Required to use the Env class and env helper (^5.6.1)." }, "config": { diff --git a/src/Illuminate/Validation/composer.json b/src/Illuminate/Validation/composer.json index fe521898878f..a64b681a72c9 100755 --- a/src/Illuminate/Validation/composer.json +++ b/src/Illuminate/Validation/composer.json @@ -25,8 +25,8 @@ "illuminate/macroable": "^11.0", "illuminate/support": "^11.0", "illuminate/translation": "^11.0", - "symfony/http-foundation": "^7.1.3", - "symfony/mime": "^7.1" + "symfony/http-foundation": "^7.1.4", + "symfony/mime": "^7.1.4" }, "autoload": { "psr-4": { From 4db4e1325fedd663ba440e6efe943e4a787e71b0 Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Fri, 20 Sep 2024 22:51:54 +0800 Subject: [PATCH 14/44] wip Signed-off-by: Mior Muhammad Zaki --- composer.json | 24 ++++++++++++------------ src/Illuminate/Console/composer.json | 2 +- src/Illuminate/Cookie/composer.json | 4 ++-- src/Illuminate/Http/composer.json | 4 ++-- src/Illuminate/Mail/composer.json | 2 +- src/Illuminate/Process/composer.json | 2 +- src/Illuminate/Queue/composer.json | 2 +- src/Illuminate/Routing/composer.json | 6 +++--- src/Illuminate/Session/composer.json | 2 +- src/Illuminate/Support/composer.json | 6 +++--- src/Illuminate/Validation/composer.json | 2 +- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/composer.json b/composer.json index 9e98c5fa520e..ba647af2a6b3 100644 --- a/composer.json +++ b/composer.json @@ -43,14 +43,14 @@ "psr/simple-cache": "^1.0|^2.0|^3.0", "ramsey/uuid": "^4.7", "symfony/console": "^7.1.4", - "symfony/error-handler": "^7.1.4", + "symfony/error-handler": "^7.1.3", "symfony/finder": "^7.1.4", - "symfony/http-foundation": "^7.1.4", - "symfony/http-kernel": "^7.1.4", - "symfony/mailer": "^7.1.4", + "symfony/http-foundation": "^7.1.3", + "symfony/http-kernel": "^7.1.3", + "symfony/mailer": "^7.1.2", "symfony/mime": "^7.1.4", "symfony/polyfill-php83": "^1.30", - "symfony/process": "^7.1.4", + "symfony/process": "^7.1.3", "symfony/routing": "^7.1.4", "symfony/uid": "^7.1.4", "symfony/var-dumper": "^7.1.4", @@ -114,7 +114,7 @@ "resend/resend-php": "^0.10.0", "symfony/cache": "^7.1.4", "symfony/http-client": "^7.1.4", - "symfony/psr-http-message-bridge": "^7.1.4", + "symfony/psr-http-message-bridge": "^7.1.3", "nette/schema": "dev-master as v1.3.0" }, "conflict": { @@ -185,12 +185,12 @@ "psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).", "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^6.0|^7.0).", "resend/resend-php": "Required to enable support for the Resend mail transport (^0.10.0).", - "symfony/cache": "Required to PSR-6 cache bridge (^7.0).", - "symfony/filesystem": "Required to enable support for relative symbolic links (^7.0).", - "symfony/http-client": "Required to enable support for the Symfony API mail transports (^7.0).", - "symfony/mailgun-mailer": "Required to enable support for the Mailgun mail transport (^7.0).", - "symfony/postmark-mailer": "Required to enable support for the Postmark mail transport (^7.0).", - "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^7.0)." + "symfony/cache": "Required to PSR-6 cache bridge (^7.1).", + "symfony/filesystem": "Required to enable support for relative symbolic links (^7.1).", + "symfony/http-client": "Required to enable support for the Symfony API mail transports (^7.1).", + "symfony/mailgun-mailer": "Required to enable support for the Mailgun mail transport (^7.1).", + "symfony/postmark-mailer": "Required to enable support for the Postmark mail transport (^7.1).", + "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^7.1)." }, "config": { "sort-packages": true, diff --git a/src/Illuminate/Console/composer.json b/src/Illuminate/Console/composer.json index aee202a2391c..fc8e36723bf4 100755 --- a/src/Illuminate/Console/composer.json +++ b/src/Illuminate/Console/composer.json @@ -25,7 +25,7 @@ "nunomaduro/termwind": "^2.0", "symfony/console": "^7.1.4", "symfony/polyfill-php83": "^1.30", - "symfony/process": "^7.1.4" + "symfony/process": "^7.1.3" }, "autoload": { "psr-4": { diff --git a/src/Illuminate/Cookie/composer.json b/src/Illuminate/Cookie/composer.json index 5e1be3be799c..84e0ab9d5a48 100755 --- a/src/Illuminate/Cookie/composer.json +++ b/src/Illuminate/Cookie/composer.json @@ -20,8 +20,8 @@ "illuminate/contracts": "^11.0", "illuminate/macroable": "^11.0", "illuminate/support": "^11.0", - "symfony/http-foundation": "^7.1.4", - "symfony/http-kernel": "^7.1.4" + "symfony/http-foundation": "^7.1.3", + "symfony/http-kernel": "^7.1.3" }, "autoload": { "psr-4": { diff --git a/src/Illuminate/Http/composer.json b/src/Illuminate/Http/composer.json index 5bfd2e3ed5ad..b8d1dac37b55 100755 --- a/src/Illuminate/Http/composer.json +++ b/src/Illuminate/Http/composer.json @@ -23,8 +23,8 @@ "illuminate/macroable": "^11.0", "illuminate/session": "^11.0", "illuminate/support": "^11.0", - "symfony/http-foundation": "^7.1.4", - "symfony/http-kernel": "^7.1.4", + "symfony/http-foundation": "^7.1.3", + "symfony/http-kernel": "^7.1.3", "symfony/polyfill-php83": "^1.30", "symfony/mime": "^7.1.4" }, diff --git a/src/Illuminate/Mail/composer.json b/src/Illuminate/Mail/composer.json index 6068be3cf7b7..298081ed1ec0 100755 --- a/src/Illuminate/Mail/composer.json +++ b/src/Illuminate/Mail/composer.json @@ -22,7 +22,7 @@ "illuminate/support": "^11.0", "league/commonmark": "^2.2", "psr/log": "^1.0|^2.0|^3.0", - "symfony/mailer": "^7.1.4", + "symfony/mailer": "^7.1.2", "tijsverkoyen/css-to-inline-styles": "^2.2.5" }, "autoload": { diff --git a/src/Illuminate/Process/composer.json b/src/Illuminate/Process/composer.json index c563e10bfb05..32646b4438a8 100644 --- a/src/Illuminate/Process/composer.json +++ b/src/Illuminate/Process/composer.json @@ -19,7 +19,7 @@ "illuminate/contracts": "^11.0", "illuminate/macroable": "^11.0", "illuminate/support": "^11.0", - "symfony/process": "^7.1.4" + "symfony/process": "^7.1.3" }, "autoload": { "psr-4": { diff --git a/src/Illuminate/Queue/composer.json b/src/Illuminate/Queue/composer.json index ee41c5f03ebe..60a71244f1de 100644 --- a/src/Illuminate/Queue/composer.json +++ b/src/Illuminate/Queue/composer.json @@ -25,7 +25,7 @@ "illuminate/support": "^11.0", "laravel/serializable-closure": "^1.2.2", "ramsey/uuid": "^4.7", - "symfony/process": "^7.1.4" + "symfony/process": "^7.1.3" }, "autoload": { "psr-4": { diff --git a/src/Illuminate/Routing/composer.json b/src/Illuminate/Routing/composer.json index 39f7381dc7c7..a3471b1cd9a5 100644 --- a/src/Illuminate/Routing/composer.json +++ b/src/Illuminate/Routing/composer.json @@ -25,8 +25,8 @@ "illuminate/pipeline": "^11.0", "illuminate/session": "^11.0", "illuminate/support": "^11.0", - "symfony/http-foundation": "^7.1.4", - "symfony/http-kernel": "^7.1.4", + "symfony/http-foundation": "^7.1.3", + "symfony/http-kernel": "^7.1.3", "symfony/routing": "^7.1.4" }, "autoload": { @@ -42,7 +42,7 @@ "suggest": { "illuminate/console": "Required to use the make commands (^11.0).", "nyholm/psr7": "Required to use PSR-7 bridging features (^1.2).", - "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^7.1.4)." + "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^7.1)." }, "config": { "sort-packages": true diff --git a/src/Illuminate/Session/composer.json b/src/Illuminate/Session/composer.json index e291f3755e6b..906ab40b16c8 100755 --- a/src/Illuminate/Session/composer.json +++ b/src/Illuminate/Session/composer.json @@ -22,7 +22,7 @@ "illuminate/filesystem": "^11.0", "illuminate/support": "^11.0", "symfony/finder": "^7.1.4", - "symfony/http-foundation": "^7.1.4" + "symfony/http-foundation": "^7.1.3" }, "autoload": { "psr-4": { diff --git a/src/Illuminate/Support/composer.json b/src/Illuminate/Support/composer.json index d3b861507719..71b5899a17f6 100644 --- a/src/Illuminate/Support/composer.json +++ b/src/Illuminate/Support/composer.json @@ -49,9 +49,9 @@ "illuminate/filesystem": "Required to use the composer class (^11.0).", "league/commonmark": "Required to use Str::markdown() and Stringable::markdown() (^2.0.2).", "ramsey/uuid": "Required to use Str::uuid() (^4.7).", - "symfony/process": "Required to use the composer class (^7.1.4).", - "symfony/uid": "Required to use Str::ulid() (^7.1.4).", - "symfony/var-dumper": "Required to use the dd function (^7.1.4).", + "symfony/process": "Required to use the composer class (^7.1).", + "symfony/uid": "Required to use Str::ulid() (^7.1).", + "symfony/var-dumper": "Required to use the dd function (^7.1).", "vlucas/phpdotenv": "Required to use the Env class and env helper (^5.6.1)." }, "config": { diff --git a/src/Illuminate/Validation/composer.json b/src/Illuminate/Validation/composer.json index a64b681a72c9..755457de4d87 100755 --- a/src/Illuminate/Validation/composer.json +++ b/src/Illuminate/Validation/composer.json @@ -25,7 +25,7 @@ "illuminate/macroable": "^11.0", "illuminate/support": "^11.0", "illuminate/translation": "^11.0", - "symfony/http-foundation": "^7.1.4", + "symfony/http-foundation": "^7.1.3", "symfony/mime": "^7.1.4" }, "autoload": { From 943536764912b87f797285b132d2ce7e491ef936 Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Mon, 23 Sep 2024 18:05:51 +0800 Subject: [PATCH 15/44] wip Signed-off-by: Mior Muhammad Zaki --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 6c1901545420..0a9d0af8a949 100644 --- a/composer.json +++ b/composer.json @@ -111,7 +111,7 @@ "pda/pheanstalk": "^5.0", "phpstan/phpstan": "^1.11.5", "phpunit/phpunit": "^10.5.12|^11.3.2", - "predis/predis": "^2.2.0", + "predis/predis": "v2.x-dev", "resend/resend-php": "^0.10.0", "symfony/cache": "^7.1.4", "symfony/http-client": "^7.1.4", From 348d2d5f58fa595805edda2e657873aa6cecbafe Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Mon, 23 Sep 2024 18:12:38 +0800 Subject: [PATCH 16/44] wip Signed-off-by: Mior Muhammad Zaki --- src/Illuminate/Validation/ValidationRuleParser.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Illuminate/Validation/ValidationRuleParser.php b/src/Illuminate/Validation/ValidationRuleParser.php index f803540fa2a9..d4a8f1e4b062 100644 --- a/src/Illuminate/Validation/ValidationRuleParser.php +++ b/src/Illuminate/Validation/ValidationRuleParser.php @@ -282,7 +282,7 @@ protected static function parseStringRule($rule) */ protected static function parseParameters($rule, $parameter) { - return static::ruleIsRegex($rule) ? [$parameter] : str_getcsv($parameter); + return static::ruleIsRegex($rule) ? [$parameter] : str_getcsv($parameter, escape: "\\"); } /** From b225b78447bcb05b7aca01f61f3a205bcfb22101 Mon Sep 17 00:00:00 2001 From: StyleCI Bot Date: Mon, 23 Sep 2024 10:12:51 +0000 Subject: [PATCH 17/44] Apply fixes from StyleCI --- src/Illuminate/Validation/ValidationRuleParser.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Illuminate/Validation/ValidationRuleParser.php b/src/Illuminate/Validation/ValidationRuleParser.php index d4a8f1e4b062..9d9c7166593a 100644 --- a/src/Illuminate/Validation/ValidationRuleParser.php +++ b/src/Illuminate/Validation/ValidationRuleParser.php @@ -282,7 +282,7 @@ protected static function parseStringRule($rule) */ protected static function parseParameters($rule, $parameter) { - return static::ruleIsRegex($rule) ? [$parameter] : str_getcsv($parameter, escape: "\\"); + return static::ruleIsRegex($rule) ? [$parameter] : str_getcsv($parameter, escape: '\\'); } /** From fcab09274631c0536d98657d15fab46eb7284732 Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Mon, 23 Sep 2024 18:20:39 +0800 Subject: [PATCH 18/44] wip Signed-off-by: Mior Muhammad Zaki --- tests/Validation/ValidationUniqueRuleTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Validation/ValidationUniqueRuleTest.php b/tests/Validation/ValidationUniqueRuleTest.php index 69212ab4063e..cd61f972170e 100644 --- a/tests/Validation/ValidationUniqueRuleTest.php +++ b/tests/Validation/ValidationUniqueRuleTest.php @@ -57,8 +57,8 @@ public function testItCorrectlyFormatsAStringVersionOfTheRule() $rule->ignore('Taylor, Otwell"\'..-"', 'id_column'); $rule->where('foo', 'bar'); $this->assertSame('unique:table,column,"Taylor, Otwell\"\\\'..-\"",id_column,foo,"bar"', (string) $rule); - $this->assertSame('Taylor, Otwell"\'..-"', stripslashes(str_getcsv('table,column,"Taylor, Otwell\"\\\'..-\"",id_column,foo,"bar"')[2])); - $this->assertSame('id_column', stripslashes(str_getcsv('table,column,"Taylor, Otwell\"\\\'..-\"",id_column,foo,"bar"')[3])); + $this->assertSame('Taylor, Otwell"\'..-"', stripslashes(str_getcsv('table,column,"Taylor, Otwell\"\\\'..-\"",id_column,foo,"bar"', escape: "\\")[2])); + $this->assertSame('id_column', stripslashes(str_getcsv('table,column,"Taylor, Otwell\"\\\'..-\"",id_column,foo,"bar"', escape: "\\")[3])); $rule = new Unique('table', 'column'); $rule->ignore(null, 'id_column'); From eda47acd977303c4797fd11bf5635ea203f0e626 Mon Sep 17 00:00:00 2001 From: StyleCI Bot Date: Mon, 23 Sep 2024 10:21:24 +0000 Subject: [PATCH 19/44] Apply fixes from StyleCI --- tests/Validation/ValidationUniqueRuleTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Validation/ValidationUniqueRuleTest.php b/tests/Validation/ValidationUniqueRuleTest.php index cd61f972170e..8b4c85054ca5 100644 --- a/tests/Validation/ValidationUniqueRuleTest.php +++ b/tests/Validation/ValidationUniqueRuleTest.php @@ -57,8 +57,8 @@ public function testItCorrectlyFormatsAStringVersionOfTheRule() $rule->ignore('Taylor, Otwell"\'..-"', 'id_column'); $rule->where('foo', 'bar'); $this->assertSame('unique:table,column,"Taylor, Otwell\"\\\'..-\"",id_column,foo,"bar"', (string) $rule); - $this->assertSame('Taylor, Otwell"\'..-"', stripslashes(str_getcsv('table,column,"Taylor, Otwell\"\\\'..-\"",id_column,foo,"bar"', escape: "\\")[2])); - $this->assertSame('id_column', stripslashes(str_getcsv('table,column,"Taylor, Otwell\"\\\'..-\"",id_column,foo,"bar"', escape: "\\")[3])); + $this->assertSame('Taylor, Otwell"\'..-"', stripslashes(str_getcsv('table,column,"Taylor, Otwell\"\\\'..-\"",id_column,foo,"bar"', escape: '\\')[2])); + $this->assertSame('id_column', stripslashes(str_getcsv('table,column,"Taylor, Otwell\"\\\'..-\"",id_column,foo,"bar"', escape: '\\')[3])); $rule = new Unique('table', 'column'); $rule->ignore(null, 'id_column'); From f358fada9873e314a293f7a0e1305fcc929cc421 Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Mon, 23 Sep 2024 18:25:09 +0800 Subject: [PATCH 20/44] wip Signed-off-by: Mior Muhammad Zaki --- .github/workflows/databases-nightly.yml | 5 ++--- .github/workflows/databases.yml | 2 +- .github/workflows/queues.yml | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/databases-nightly.yml b/.github/workflows/databases-nightly.yml index 775e1d85e494..12f7b87352c6 100644 --- a/.github/workflows/databases-nightly.yml +++ b/.github/workflows/databases-nightly.yml @@ -1,9 +1,8 @@ name: databases-nightly on: - workflow_dispatch: - # schedule: - # - cron: '0 0 * * *' + schedule: + - cron: '0 0 * * *' jobs: mysql_9: diff --git a/.github/workflows/databases.yml b/.github/workflows/databases.yml index a656fea5be88..2e43e64bb946 100644 --- a/.github/workflows/databases.yml +++ b/.github/workflows/databases.yml @@ -5,7 +5,7 @@ on: branches: - master - '*.x' - pull_request: + # pull_request: jobs: mysql_57: diff --git a/.github/workflows/queues.yml b/.github/workflows/queues.yml index 0c2ee8310a06..571c1855815a 100644 --- a/.github/workflows/queues.yml +++ b/.github/workflows/queues.yml @@ -5,7 +5,7 @@ on: branches: - master - '*.x' - pull_request: + # pull_request: jobs: sync: From 1300d12f9abe9e609d282db5c99c5b9b82fdf5d5 Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Tue, 24 Sep 2024 15:08:22 +0800 Subject: [PATCH 21/44] wip Signed-off-by: Mior Muhammad Zaki --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 0a9d0af8a949..04a30f6266ac 100644 --- a/composer.json +++ b/composer.json @@ -108,7 +108,7 @@ "mockery/mockery": "^1.6.10", "nyholm/psr7": "^1.2", "orchestra/testbench-core": "^9.4.0", - "pda/pheanstalk": "^5.0", + "pda/pheanstalk": "^5.0.6", "phpstan/phpstan": "^1.11.5", "phpunit/phpunit": "^10.5.12|^11.3.2", "predis/predis": "v2.x-dev", From e4e5e30bbc963fa99dc451c1d3cfb954eb1a8a59 Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Tue, 24 Sep 2024 15:10:54 +0800 Subject: [PATCH 22/44] wip Signed-off-by: Mior Muhammad Zaki --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 05c69d02540a..543d15476cca 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -93,7 +93,7 @@ jobs: command: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress - name: Execute tests - run: vendor/bin/phpunit --display-deprecation + run: vendor/bin/phpunit --display-deprecation --fail-on-deprecation env: DB_PORT: ${{ job.services.mysql.ports[3306] }} DB_USERNAME: root From f87fcdada2433b2c34bf895a9688e2ccd8dfead0 Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Thu, 3 Oct 2024 14:19:15 +0800 Subject: [PATCH 23/44] wip Signed-off-by: Mior Muhammad Zaki --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 5b77110414fe..2a1c7796f2c9 100644 --- a/composer.json +++ b/composer.json @@ -110,7 +110,7 @@ "orchestra/testbench-core": "^9.4.0", "pda/pheanstalk": "^5.0.6", "phpstan/phpstan": "^1.11.5", - "phpunit/phpunit": "^10.5.12|^11.3.2", + "phpunit/phpunit": "^10.5.35|^11.3.6", "predis/predis": "v2.x-dev", "resend/resend-php": "^0.10.0", "symfony/cache": "^7.1.4", From 105e49684b2ef6b25b855d1cf2525288c12c1082 Mon Sep 17 00:00:00 2001 From: Julius Kiekbusch Date: Thu, 3 Oct 2024 19:32:16 +0200 Subject: [PATCH 24/44] [PHP84] Bump aws/aws-sdk-php for PHP 8.4 (#53021) * Bump aws/aws-sdk-php for PHP 8.4 * Revert some unrelated changes --- composer.json | 4 ++-- src/Illuminate/Mail/composer.json | 2 +- src/Illuminate/Queue/composer.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 2a1c7796f2c9..7f67564e97db 100644 --- a/composer.json +++ b/composer.json @@ -98,7 +98,7 @@ "require-dev": { "ext-gmp": "*", "ably/ably-php": "^1.0", - "aws/aws-sdk-php": "^3.235.5", + "aws/aws-sdk-php": "^3.322.9", "fakerphp/faker": "^1.23", "league/flysystem-aws-s3-v3": "^3.25.1", "league/flysystem-ftp": "^3.25.1", @@ -170,7 +170,7 @@ "ext-posix": "Required to use all features of the queue worker.", "ext-redis": "Required to use the Redis cache and queue drivers (^4.0|^5.0|^6.0).", "ably/ably-php": "Required to use the Ably broadcast driver (^1.0).", - "aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage, and SES mail driver (^3.235.5).", + "aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage, and SES mail driver (^3.322.9).", "brianium/paratest": "Required to run tests in parallel (^7.0|^8.0).", "fakerphp/faker": "Required to use the eloquent factory builder (^1.9.1).", "filp/whoops": "Required for friendly error pages in development (^2.14.3).", diff --git a/src/Illuminate/Mail/composer.json b/src/Illuminate/Mail/composer.json index 298081ed1ec0..c24ada38e444 100755 --- a/src/Illuminate/Mail/composer.json +++ b/src/Illuminate/Mail/composer.json @@ -36,7 +36,7 @@ } }, "suggest": { - "aws/aws-sdk-php": "Required to use the SES mail driver (^3.235.5).", + "aws/aws-sdk-php": "Required to use the SES mail driver (^3.322.9).", "resend/resend-php": "Required to enable support for the Resend mail transport (^0.10.0).", "symfony/http-client": "Required to use the Symfony API mail transports (^7.1.4).", "symfony/mailgun-mailer": "Required to enable support for the Mailgun mail transport (^7.1.4).", diff --git a/src/Illuminate/Queue/composer.json b/src/Illuminate/Queue/composer.json index 60a71244f1de..bdec7191e49d 100644 --- a/src/Illuminate/Queue/composer.json +++ b/src/Illuminate/Queue/composer.json @@ -43,7 +43,7 @@ "ext-mbstring": "Required to use the database failed job providers.", "ext-pcntl": "Required to use all features of the queue worker.", "ext-posix": "Required to use all features of the queue worker.", - "aws/aws-sdk-php": "Required to use the SQS queue driver and DynamoDb failed job storage (^3.235.5).", + "aws/aws-sdk-php": "Required to use the SQS queue driver and DynamoDb failed job storage (^3.322.9).", "illuminate/redis": "Required to use the Redis queue driver (^11.0).", "pda/pheanstalk": "Required to use the Beanstalk queue driver (^5.0)." }, From 0b1e1a81e35002465168b92e698fc2db4c9b080e Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Fri, 4 Oct 2024 09:37:43 +0800 Subject: [PATCH 25/44] wip Signed-off-by: Mior Muhammad Zaki --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 7f67564e97db..5760ceb7c358 100644 --- a/composer.json +++ b/composer.json @@ -107,7 +107,7 @@ "league/flysystem-sftp-v3": "^3.25.1", "mockery/mockery": "^1.6.10", "nyholm/psr7": "^1.2", - "orchestra/testbench-core": "^9.4.0", + "orchestra/testbench-core": "dev-php84", "pda/pheanstalk": "^5.0.6", "phpstan/phpstan": "^1.11.5", "phpunit/phpunit": "^10.5.35|^11.3.6", From 7593b9e3054d0e7ac6a8c2160f1c40f9f985f8fd Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Fri, 4 Oct 2024 11:24:15 +0800 Subject: [PATCH 26/44] wip Signed-off-by: Mior Muhammad Zaki --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 543d15476cca..221b7226ed64 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -76,7 +76,7 @@ jobs: with: timeout_minutes: 5 max_attempts: 5 - command: composer require nesbot/carbon:^3.4 guzzlehttp/promises:^2.0.3 --no-interaction --no-update + command: composer require "nesbot/carbon:^3.4" "guzzlehttp/promises:^2.0.3" "symfony/contracts:^2.5.3|^3.4.2" --no-interaction --no-update - name: Set PHPUnit uses: nick-fields/retry@v3 From 097f9cef2481ab6e43f6c3a28eb4fc60f29d1e1e Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Fri, 4 Oct 2024 11:30:59 +0800 Subject: [PATCH 27/44] wip Signed-off-by: Mior Muhammad Zaki --- .github/workflows/tests.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 221b7226ed64..baeb3c218f1d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -76,7 +76,7 @@ jobs: with: timeout_minutes: 5 max_attempts: 5 - command: composer require "nesbot/carbon:^3.4" "guzzlehttp/promises:^2.0.3" "symfony/contracts:^2.5.3|^3.4.2" --no-interaction --no-update + command: composer require "nesbot/carbon:^3.4" "guzzlehttp/promises:^2.0.3" "symfony/contracts:^3.4.2" "symfony/translation:^7.0.3" --no-interaction --no-update - name: Set PHPUnit uses: nick-fields/retry@v3 @@ -92,6 +92,9 @@ jobs: max_attempts: 5 command: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress + - name: Installed dependencies + run: composer show -D + - name: Execute tests run: vendor/bin/phpunit --display-deprecation --fail-on-deprecation env: From 3667a2e884126103b41f7559ec60211a933d292d Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Fri, 4 Oct 2024 11:36:18 +0800 Subject: [PATCH 28/44] wip Signed-off-by: Mior Muhammad Zaki --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index baeb3c218f1d..a854fa5294c6 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -76,7 +76,7 @@ jobs: with: timeout_minutes: 5 max_attempts: 5 - command: composer require "nesbot/carbon:^3.4" "guzzlehttp/promises:^2.0.3" "symfony/contracts:^3.4.2" "symfony/translation:^7.0.3" --no-interaction --no-update + command: composer require "nesbot/carbon:^3.4" "guzzlehttp/promises:^2.0.3" "symfony/contracts:^3.4.2" "symfony/translation:^7.0.3" "mtdowling/jmespath.php:^2.8.0" --no-interaction --no-update - name: Set PHPUnit uses: nick-fields/retry@v3 From 634d214a76bdf52a27ba8b309957010b5dfbebc3 Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Fri, 4 Oct 2024 11:36:53 +0800 Subject: [PATCH 29/44] wip Signed-off-by: Mior Muhammad Zaki --- .github/workflows/tests.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index a854fa5294c6..2b02722e7a73 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -78,19 +78,12 @@ jobs: max_attempts: 5 command: composer require "nesbot/carbon:^3.4" "guzzlehttp/promises:^2.0.3" "symfony/contracts:^3.4.2" "symfony/translation:^7.0.3" "mtdowling/jmespath.php:^2.8.0" --no-interaction --no-update - - name: Set PHPUnit - uses: nick-fields/retry@v3 - with: - timeout_minutes: 5 - max_attempts: 5 - command: composer require phpunit/phpunit:^${{ matrix.phpunit }} --dev --no-interaction --no-update - - name: Install dependencies uses: nick-fields/retry@v3 with: timeout_minutes: 5 max_attempts: 5 - command: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress + command: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress --with=phpunit/phpunit:^${{ matrix.phpunit }} - name: Installed dependencies run: composer show -D From 3b7a7230019c622873df4caf151f5bfeb8e15344 Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Fri, 4 Oct 2024 11:52:05 +0800 Subject: [PATCH 30/44] wip Signed-off-by: Mior Muhammad Zaki --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 5760ceb7c358..ae33c357b562 100644 --- a/composer.json +++ b/composer.json @@ -35,6 +35,7 @@ "laravel/serializable-closure": "^1.3", "league/commonmark": "^2.2.1", "league/flysystem": "^3.25.1", + "league/flysystem-local": "^3.25.1", "monolog/monolog": "^3.0", "nesbot/carbon": "^2.72.2|^3.4", "nunomaduro/termwind": "^2.0", From 509ff73bf9df6c0ed7592b29cd195fabc8b858a1 Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Fri, 4 Oct 2024 11:56:40 +0800 Subject: [PATCH 31/44] wip Signed-off-by: Mior Muhammad Zaki --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2b02722e7a73..3b38e5d1a6ad 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -76,7 +76,7 @@ jobs: with: timeout_minutes: 5 max_attempts: 5 - command: composer require "nesbot/carbon:^3.4" "guzzlehttp/promises:^2.0.3" "symfony/contracts:^3.4.2" "symfony/translation:^7.0.3" "mtdowling/jmespath.php:^2.8.0" --no-interaction --no-update + command: composer require "nesbot/carbon:^3.4" "guzzlehttp/promises:^2.0.3" "symfony/contracts:^3.4.2" "symfony/translation:^7.0.3" "mtdowling/jmespath.php:^2.8.0" "league/mime-type-detection:^1.16.0" --no-interaction --no-update - name: Install dependencies uses: nick-fields/retry@v3 From e445003104915fdaa69bae112e635f400bf2c320 Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Fri, 4 Oct 2024 11:59:21 +0800 Subject: [PATCH 32/44] wip Signed-off-by: Mior Muhammad Zaki --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 3b38e5d1a6ad..35d4e6af52e7 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -76,7 +76,7 @@ jobs: with: timeout_minutes: 5 max_attempts: 5 - command: composer require "nesbot/carbon:^3.4" "guzzlehttp/promises:^2.0.3" "symfony/contracts:^3.4.2" "symfony/translation:^7.0.3" "mtdowling/jmespath.php:^2.8.0" "league/mime-type-detection:^1.16.0" --no-interaction --no-update + command: composer require "nesbot/carbon:^3.4" "guzzlehttp/promises:^2.0.3" "symfony/contracts:^3.4.2" "symfony/string:^7.0.3" "symfony/translation:^7.0.3" "mtdowling/jmespath.php:^2.8.0" "league/mime-type-detection:^1.16.0" --no-interaction --no-update - name: Install dependencies uses: nick-fields/retry@v3 From 41924026b7bda7757a328c25d23a06d5d09b9723 Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Fri, 4 Oct 2024 13:26:37 +0800 Subject: [PATCH 33/44] Update tests.yml --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 35d4e6af52e7..9b87a512d323 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -53,7 +53,7 @@ jobs: uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php }} - extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, gd, redis-6.1.0RC1, igbinary, msgpack, lzf, zstd, lz4, memcached, gmp, :php-psr + extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, gd, redis:6.1, igbinary, msgpack, lzf, zstd, lz4, memcached, gmp, :php-psr ini-values: error_reporting=E_ALL tools: composer:v2 coverage: none From bca3d03aacbd17336cc87f1be892c74dff23ace9 Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Fri, 4 Oct 2024 14:08:29 +0800 Subject: [PATCH 34/44] Revert "Update tests.yml" This reverts commit 41924026b7bda7757a328c25d23a06d5d09b9723. --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9b87a512d323..35d4e6af52e7 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -53,7 +53,7 @@ jobs: uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php }} - extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, gd, redis:6.1, igbinary, msgpack, lzf, zstd, lz4, memcached, gmp, :php-psr + extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, gd, redis-6.1.0RC1, igbinary, msgpack, lzf, zstd, lz4, memcached, gmp, :php-psr ini-values: error_reporting=E_ALL tools: composer:v2 coverage: none From ca6704b3b0992170c820b78658e228e130188988 Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Fri, 4 Oct 2024 14:09:49 +0800 Subject: [PATCH 35/44] wip Signed-off-by: Mior Muhammad Zaki --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 35d4e6af52e7..fcd5ea8873a9 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -53,7 +53,7 @@ jobs: uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php }} - extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, gd, redis-6.1.0RC1, igbinary, msgpack, lzf, zstd, lz4, memcached, gmp, :php-psr + extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, gd, redis-6.1.0RC2, igbinary, msgpack, lzf, zstd, lz4, memcached, gmp, :php-psr ini-values: error_reporting=E_ALL tools: composer:v2 coverage: none From 9896568d1bf4038827c4c052b8321d86bab760c5 Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Fri, 4 Oct 2024 15:55:59 +0800 Subject: [PATCH 36/44] wip Signed-off-by: Mior Muhammad Zaki --- composer.json | 28 ++++++++++++------------ src/Illuminate/Collections/composer.json | 2 +- src/Illuminate/Routing/composer.json | 2 +- src/Illuminate/Support/composer.json | 6 ++--- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/composer.json b/composer.json index ae33c357b562..af199e0f6ed3 100644 --- a/composer.json +++ b/composer.json @@ -43,18 +43,18 @@ "psr/log": "^1.0|^2.0|^3.0", "psr/simple-cache": "^1.0|^2.0|^3.0", "ramsey/uuid": "^4.7", - "symfony/console": "^7.1.4", - "symfony/error-handler": "^7.1.3", - "symfony/finder": "^7.1.4", - "symfony/http-foundation": "^7.1.3", - "symfony/http-kernel": "^7.1.3", + "symfony/console": "^7.0.3", + "symfony/error-handler": "^7.0.3", + "symfony/finder": "^7.0.3", + "symfony/http-foundation": "^7.0.3", + "symfony/http-kernel": "^7.0.3", "symfony/mailer": "^7.1.2", - "symfony/mime": "^7.1.4", + "symfony/mime": "^7.0.3", "symfony/polyfill-php83": "^1.30", - "symfony/process": "^7.1.3", - "symfony/routing": "^7.1.4", - "symfony/uid": "^7.1.4", - "symfony/var-dumper": "^7.1.4", + "symfony/process": "^7.0.3", + "symfony/routing": "^7.0.3", + "symfony/uid": "^7.0.3", + "symfony/var-dumper": "^7.0.3", "tijsverkoyen/css-to-inline-styles": "^2.2.5", "vlucas/phpdotenv": "^5.6.1", "voku/portable-ascii": "^2.0" @@ -114,9 +114,9 @@ "phpunit/phpunit": "^10.5.35|^11.3.6", "predis/predis": "v2.x-dev", "resend/resend-php": "^0.10.0", - "symfony/cache": "^7.1.4", - "symfony/http-client": "^7.1.4", - "symfony/psr-http-message-bridge": "^7.1.3", + "symfony/cache": "^7.0.3", + "symfony/http-client": "^7.0.3", + "symfony/psr-http-message-bridge": "^7.0.3", "nette/schema": "dev-master as v1.3.0" }, "conflict": { @@ -194,7 +194,7 @@ "symfony/http-client": "Required to enable support for the Symfony API mail transports (^7.1).", "symfony/mailgun-mailer": "Required to enable support for the Mailgun mail transport (^7.1).", "symfony/postmark-mailer": "Required to enable support for the Postmark mail transport (^7.1).", - "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^7.1)." + "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^7.0)." }, "config": { "sort-packages": true, diff --git a/src/Illuminate/Collections/composer.json b/src/Illuminate/Collections/composer.json index d2a6116ca585..1924032ab915 100644 --- a/src/Illuminate/Collections/composer.json +++ b/src/Illuminate/Collections/composer.json @@ -33,7 +33,7 @@ } }, "suggest": { - "symfony/var-dumper": "Required to use the dump method (^7.1.4)." + "symfony/var-dumper": "Required to use the dump method (^7.0)." }, "config": { "sort-packages": true diff --git a/src/Illuminate/Routing/composer.json b/src/Illuminate/Routing/composer.json index a3471b1cd9a5..04bab2882363 100644 --- a/src/Illuminate/Routing/composer.json +++ b/src/Illuminate/Routing/composer.json @@ -42,7 +42,7 @@ "suggest": { "illuminate/console": "Required to use the make commands (^11.0).", "nyholm/psr7": "Required to use PSR-7 bridging features (^1.2).", - "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^7.1)." + "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^7.0)." }, "config": { "sort-packages": true diff --git a/src/Illuminate/Support/composer.json b/src/Illuminate/Support/composer.json index 3dc0abc4faf1..c927d1e5eab3 100644 --- a/src/Illuminate/Support/composer.json +++ b/src/Illuminate/Support/composer.json @@ -51,9 +51,9 @@ "laravel/serializable-closure": "Required to use the once function (^1.3).", "league/commonmark": "Required to use Str::markdown() and Stringable::markdown() (^2.0.2).", "ramsey/uuid": "Required to use Str::uuid() (^4.7).", - "symfony/process": "Required to use the composer class (^7.1).", - "symfony/uid": "Required to use Str::ulid() (^7.1).", - "symfony/var-dumper": "Required to use the dd function (^7.1).", + "symfony/process": "Required to use the composer class (^7.0).", + "symfony/uid": "Required to use Str::ulid() (^7.0).", + "symfony/var-dumper": "Required to use the dd function (^7.0).", "vlucas/phpdotenv": "Required to use the Env class and env helper (^5.6.1)." }, "config": { From 201f6007baa76c84012bfe202452adcc18cc71d0 Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Fri, 4 Oct 2024 16:01:36 +0800 Subject: [PATCH 37/44] wip Signed-off-by: Mior Muhammad Zaki --- composer.json | 12 ++++++------ src/Illuminate/Cache/composer.json | 2 +- src/Illuminate/Console/composer.json | 4 ++-- src/Illuminate/Cookie/composer.json | 4 ++-- src/Illuminate/Database/composer.json | 2 +- src/Illuminate/Filesystem/composer.json | 2 +- src/Illuminate/Http/composer.json | 6 +++--- src/Illuminate/Mail/composer.json | 8 ++++---- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/composer.json b/composer.json index af199e0f6ed3..4c0420b7b723 100644 --- a/composer.json +++ b/composer.json @@ -48,7 +48,7 @@ "symfony/finder": "^7.0.3", "symfony/http-foundation": "^7.0.3", "symfony/http-kernel": "^7.0.3", - "symfony/mailer": "^7.1.2", + "symfony/mailer": "^7.0.3", "symfony/mime": "^7.0.3", "symfony/polyfill-php83": "^1.30", "symfony/process": "^7.0.3", @@ -189,11 +189,11 @@ "psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).", "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^6.0|^7.0).", "resend/resend-php": "Required to enable support for the Resend mail transport (^0.10.0).", - "symfony/cache": "Required to PSR-6 cache bridge (^7.1).", - "symfony/filesystem": "Required to enable support for relative symbolic links (^7.1).", - "symfony/http-client": "Required to enable support for the Symfony API mail transports (^7.1).", - "symfony/mailgun-mailer": "Required to enable support for the Mailgun mail transport (^7.1).", - "symfony/postmark-mailer": "Required to enable support for the Postmark mail transport (^7.1).", + "symfony/cache": "Required to PSR-6 cache bridge (^7.0).", + "symfony/filesystem": "Required to enable support for relative symbolic links (^7.0).", + "symfony/http-client": "Required to enable support for the Symfony API mail transports (^7.0).", + "symfony/mailgun-mailer": "Required to enable support for the Mailgun mail transport (^7.0).", + "symfony/postmark-mailer": "Required to enable support for the Postmark mail transport (^7.0).", "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^7.0)." }, "config": { diff --git a/src/Illuminate/Cache/composer.json b/src/Illuminate/Cache/composer.json index 37954fc0a4f5..ec0d26e18469 100755 --- a/src/Illuminate/Cache/composer.json +++ b/src/Illuminate/Cache/composer.json @@ -40,7 +40,7 @@ "illuminate/database": "Required to use the database cache driver (^11.0).", "illuminate/filesystem": "Required to use the file cache driver (^11.0).", "illuminate/redis": "Required to use the redis cache driver (^11.0).", - "symfony/cache": "Required to use PSR-6 cache bridge (^7.1.4)." + "symfony/cache": "Required to use PSR-6 cache bridge (^7.0)." }, "config": { "sort-packages": true diff --git a/src/Illuminate/Console/composer.json b/src/Illuminate/Console/composer.json index 15a29f4b2fab..724778331099 100755 --- a/src/Illuminate/Console/composer.json +++ b/src/Illuminate/Console/composer.json @@ -23,9 +23,9 @@ "illuminate/view": "^11.0", "laravel/prompts": "^0.1.18|^0.2.0", "nunomaduro/termwind": "^2.0", - "symfony/console": "^7.1.4", + "symfony/console": "^7.0.3", "symfony/polyfill-php83": "^1.30", - "symfony/process": "^7.1.3" + "symfony/process": "^7.0.3" }, "autoload": { "psr-4": { diff --git a/src/Illuminate/Cookie/composer.json b/src/Illuminate/Cookie/composer.json index 84e0ab9d5a48..79c80672d0b2 100755 --- a/src/Illuminate/Cookie/composer.json +++ b/src/Illuminate/Cookie/composer.json @@ -20,8 +20,8 @@ "illuminate/contracts": "^11.0", "illuminate/macroable": "^11.0", "illuminate/support": "^11.0", - "symfony/http-foundation": "^7.1.3", - "symfony/http-kernel": "^7.1.3" + "symfony/http-foundation": "^7.0.3", + "symfony/http-kernel": "^7.0.3" }, "autoload": { "psr-4": { diff --git a/src/Illuminate/Database/composer.json b/src/Illuminate/Database/composer.json index 33f30ee02574..ace45ba91b77 100644 --- a/src/Illuminate/Database/composer.json +++ b/src/Illuminate/Database/composer.json @@ -42,7 +42,7 @@ "illuminate/filesystem": "Required to use the migrations (^11.0).", "illuminate/pagination": "Required to paginate the result set (^11.0).", "laravel/serializable-closure": "Required to handle circular references in model serialization (^1.3).", - "symfony/finder": "Required to use Eloquent model factories (^7.1.4)." + "symfony/finder": "Required to use Eloquent model factories (^7.0)." }, "config": { "sort-packages": true diff --git a/src/Illuminate/Filesystem/composer.json b/src/Illuminate/Filesystem/composer.json index ed17f52cff5d..bd2cea33982b 100644 --- a/src/Illuminate/Filesystem/composer.json +++ b/src/Illuminate/Filesystem/composer.json @@ -19,7 +19,7 @@ "illuminate/contracts": "^11.0", "illuminate/macroable": "^11.0", "illuminate/support": "^11.0", - "symfony/finder": "^7.1.4" + "symfony/finder": "^7.0.3" }, "autoload": { "psr-4": { diff --git a/src/Illuminate/Http/composer.json b/src/Illuminate/Http/composer.json index b8d1dac37b55..3e7e7f7a7f0a 100755 --- a/src/Illuminate/Http/composer.json +++ b/src/Illuminate/Http/composer.json @@ -23,10 +23,10 @@ "illuminate/macroable": "^11.0", "illuminate/session": "^11.0", "illuminate/support": "^11.0", - "symfony/http-foundation": "^7.1.3", - "symfony/http-kernel": "^7.1.3", + "symfony/http-foundation": "^7.0.3", + "symfony/http-kernel": "^7.0.3", "symfony/polyfill-php83": "^1.30", - "symfony/mime": "^7.1.4" + "symfony/mime": "^7.0.3" }, "autoload": { "psr-4": { diff --git a/src/Illuminate/Mail/composer.json b/src/Illuminate/Mail/composer.json index c24ada38e444..f81532e654cc 100755 --- a/src/Illuminate/Mail/composer.json +++ b/src/Illuminate/Mail/composer.json @@ -22,7 +22,7 @@ "illuminate/support": "^11.0", "league/commonmark": "^2.2", "psr/log": "^1.0|^2.0|^3.0", - "symfony/mailer": "^7.1.2", + "symfony/mailer": "^7.0.3", "tijsverkoyen/css-to-inline-styles": "^2.2.5" }, "autoload": { @@ -38,9 +38,9 @@ "suggest": { "aws/aws-sdk-php": "Required to use the SES mail driver (^3.322.9).", "resend/resend-php": "Required to enable support for the Resend mail transport (^0.10.0).", - "symfony/http-client": "Required to use the Symfony API mail transports (^7.1.4).", - "symfony/mailgun-mailer": "Required to enable support for the Mailgun mail transport (^7.1.4).", - "symfony/postmark-mailer": "Required to enable support for the Postmark mail transport (^7.1.4)." + "symfony/http-client": "Required to use the Symfony API mail transports (^7.0).", + "symfony/mailgun-mailer": "Required to enable support for the Mailgun mail transport (^7.0).", + "symfony/postmark-mailer": "Required to enable support for the Postmark mail transport (^7.0)." }, "config": { "sort-packages": true From 49e97d3cfad40dd1fcdb43625bc590c40f279f3a Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Fri, 4 Oct 2024 16:04:45 +0800 Subject: [PATCH 38/44] wip Signed-off-by: Mior Muhammad Zaki --- src/Illuminate/Filesystem/composer.json | 4 ++-- src/Illuminate/Process/composer.json | 2 +- src/Illuminate/Routing/composer.json | 6 +++--- src/Illuminate/Session/composer.json | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Illuminate/Filesystem/composer.json b/src/Illuminate/Filesystem/composer.json index bd2cea33982b..bb9ecc66237c 100644 --- a/src/Illuminate/Filesystem/composer.json +++ b/src/Illuminate/Filesystem/composer.json @@ -44,8 +44,8 @@ "league/flysystem-ftp": "Required to use the Flysystem FTP driver (^3.25.1).", "league/flysystem-sftp-v3": "Required to use the Flysystem SFTP driver (^3.25.1).", "psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).", - "symfony/filesystem": "Required to enable support for relative symbolic links (^7.1.4).", - "symfony/mime": "Required to enable support for guessing extensions (^7.1.4)." + "symfony/filesystem": "Required to enable support for relative symbolic links (^7.0).", + "symfony/mime": "Required to enable support for guessing extensions (^7.0)." }, "config": { "sort-packages": true diff --git a/src/Illuminate/Process/composer.json b/src/Illuminate/Process/composer.json index 32646b4438a8..0425904ef047 100644 --- a/src/Illuminate/Process/composer.json +++ b/src/Illuminate/Process/composer.json @@ -19,7 +19,7 @@ "illuminate/contracts": "^11.0", "illuminate/macroable": "^11.0", "illuminate/support": "^11.0", - "symfony/process": "^7.1.3" + "symfony/process": "^7.0.3" }, "autoload": { "psr-4": { diff --git a/src/Illuminate/Routing/composer.json b/src/Illuminate/Routing/composer.json index 04bab2882363..ab9ed96d7777 100644 --- a/src/Illuminate/Routing/composer.json +++ b/src/Illuminate/Routing/composer.json @@ -25,9 +25,9 @@ "illuminate/pipeline": "^11.0", "illuminate/session": "^11.0", "illuminate/support": "^11.0", - "symfony/http-foundation": "^7.1.3", - "symfony/http-kernel": "^7.1.3", - "symfony/routing": "^7.1.4" + "symfony/http-foundation": "^7.0.3", + "symfony/http-kernel": "^7.0.3", + "symfony/routing": "^7.0.3" }, "autoload": { "psr-4": { diff --git a/src/Illuminate/Session/composer.json b/src/Illuminate/Session/composer.json index 906ab40b16c8..fe0a93c1eac3 100755 --- a/src/Illuminate/Session/composer.json +++ b/src/Illuminate/Session/composer.json @@ -21,8 +21,8 @@ "illuminate/contracts": "^11.0", "illuminate/filesystem": "^11.0", "illuminate/support": "^11.0", - "symfony/finder": "^7.1.4", - "symfony/http-foundation": "^7.1.3" + "symfony/finder": "^7.0.3", + "symfony/http-foundation": "^7.0.3" }, "autoload": { "psr-4": { From 0a84ba2e59f39e65763444abb7b4b7a7391604f2 Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Fri, 4 Oct 2024 16:05:37 +0800 Subject: [PATCH 39/44] wip Signed-off-by: Mior Muhammad Zaki --- src/Illuminate/Queue/composer.json | 2 +- src/Illuminate/Validation/composer.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Illuminate/Queue/composer.json b/src/Illuminate/Queue/composer.json index bdec7191e49d..a2e0ce710928 100644 --- a/src/Illuminate/Queue/composer.json +++ b/src/Illuminate/Queue/composer.json @@ -25,7 +25,7 @@ "illuminate/support": "^11.0", "laravel/serializable-closure": "^1.2.2", "ramsey/uuid": "^4.7", - "symfony/process": "^7.1.3" + "symfony/process": "^7.0.3" }, "autoload": { "psr-4": { diff --git a/src/Illuminate/Validation/composer.json b/src/Illuminate/Validation/composer.json index 755457de4d87..dfd137f0c3d1 100755 --- a/src/Illuminate/Validation/composer.json +++ b/src/Illuminate/Validation/composer.json @@ -25,8 +25,8 @@ "illuminate/macroable": "^11.0", "illuminate/support": "^11.0", "illuminate/translation": "^11.0", - "symfony/http-foundation": "^7.1.3", - "symfony/mime": "^7.1.4" + "symfony/http-foundation": "^7.0.3", + "symfony/mime": "^7.0.3" }, "autoload": { "psr-4": { From abbd05e57f93748e2b091082b0543cd515595923 Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Sun, 6 Oct 2024 15:20:43 +0800 Subject: [PATCH 40/44] wip Signed-off-by: Mior Muhammad Zaki --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 4c0420b7b723..56bb3ee53b4f 100644 --- a/composer.json +++ b/composer.json @@ -117,7 +117,7 @@ "symfony/cache": "^7.0.3", "symfony/http-client": "^7.0.3", "symfony/psr-http-message-bridge": "^7.0.3", - "nette/schema": "dev-master as v1.3.0" + "nette/schema": "^1.3.1" }, "conflict": { "mockery/mockery": "1.6.8", From 33e854f2e736c67c85907fe0a013a888ccdc90ce Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Fri, 11 Oct 2024 09:28:48 +0800 Subject: [PATCH 41/44] wip Signed-off-by: Mior Muhammad Zaki --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 56bb3ee53b4f..831697ff4a82 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,7 @@ "composer-runtime-api": "^2.2", "brick/math": "^0.9.3|^0.10.2|^0.11|^0.12", "doctrine/inflector": "^2.0.5", - "dragonmantank/cron-expression": "^3.3.2", + "dragonmantank/cron-expression": "^3.4", "egulias/email-validator": "^3.2.1|^4.0", "fruitcake/php-cors": "^1.3", "guzzlehttp/guzzle": "^7.8.2", From d85cc0bb22805b6cf892d46a61c2fe41aa7a4af3 Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Thu, 24 Oct 2024 14:54:31 +0800 Subject: [PATCH 42/44] Update .github/workflows/tests.yml Co-authored-by: Julius Kiekbusch --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index fcd5ea8873a9..7af6aa7a2198 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -53,7 +53,7 @@ jobs: uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php }} - extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, gd, redis-6.1.0RC2, igbinary, msgpack, lzf, zstd, lz4, memcached, gmp, :php-psr + extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, gd, redis-6.1.0, igbinary, msgpack, lzf, zstd, lz4, memcached, gmp, :php-psr ini-values: error_reporting=E_ALL tools: composer:v2 coverage: none From 91e8bd5ff71fc41567924df7e2b1ccb1b3d77c1d Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Tue, 5 Nov 2024 10:15:19 +0800 Subject: [PATCH 43/44] wip Signed-off-by: Mior Muhammad Zaki --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 831697ff4a82..8ca6d4597a68 100644 --- a/composer.json +++ b/composer.json @@ -108,7 +108,7 @@ "league/flysystem-sftp-v3": "^3.25.1", "mockery/mockery": "^1.6.10", "nyholm/psr7": "^1.2", - "orchestra/testbench-core": "dev-php84", + "orchestra/testbench-core": "9.x-dev", "pda/pheanstalk": "^5.0.6", "phpstan/phpstan": "^1.11.5", "phpunit/phpunit": "^10.5.35|^11.3.6", From d1914ad7f52ac6fafe38483c8e33469ac35d917c Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Fri, 8 Nov 2024 15:42:07 +0800 Subject: [PATCH 44/44] wip Signed-off-by: Mior Muhammad Zaki --- .github/workflows/tests.yml | 2 +- composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7af6aa7a2198..fffeaa3de2cc 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -76,7 +76,7 @@ jobs: with: timeout_minutes: 5 max_attempts: 5 - command: composer require "nesbot/carbon:^3.4" "guzzlehttp/promises:^2.0.3" "symfony/contracts:^3.4.2" "symfony/string:^7.0.3" "symfony/translation:^7.0.3" "mtdowling/jmespath.php:^2.8.0" "league/mime-type-detection:^1.16.0" --no-interaction --no-update + command: composer require "laravel/serializable-closure:^2.0" nesbot/carbon:^3.4" "guzzlehttp/promises:^2.0.3" "symfony/contracts:^3.4.2" "symfony/string:^7.0.3" "symfony/translation:^7.0.3" "mtdowling/jmespath.php:^2.8.0" "league/mime-type-detection:^1.16.0" --no-interaction --no-update - name: Install dependencies uses: nick-fields/retry@v3 diff --git a/composer.json b/composer.json index 8ca6d4597a68..0b0b355cc0cc 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,7 @@ "guzzlehttp/guzzle": "^7.8.2", "guzzlehttp/uri-template": "^1.0", "laravel/prompts": "^0.1.18|^0.2.0|^0.3.0", - "laravel/serializable-closure": "^1.3", + "laravel/serializable-closure": "^1.3|^2.0", "league/commonmark": "^2.2.1", "league/flysystem": "^3.25.1", "league/flysystem-local": "^3.25.1",