From 36e6785a7099bbec4783acc28bb73238ec58e33f Mon Sep 17 00:00:00 2001 From: Shift Date: Sat, 2 Mar 2024 08:11:34 +0000 Subject: [PATCH 1/2] Bump dependencies for Laravel 11 --- composer.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index b860e00..c29bcf1 100644 --- a/composer.json +++ b/composer.json @@ -29,16 +29,16 @@ "laragear/meta": "^2.1.0", "bacon/bacon-qr-code": "2.*", "paragonie/constant_time_encoding": "^2.5", - "illuminate/config": "9.*|10.*", - "illuminate/validation": "9.*|10.*", - "illuminate/database": "9.*|10.*", - "illuminate/support": "9.*|10.*", - "illuminate/http": "9.*|10.*", - "illuminate/auth": "9.*|10.*" + "illuminate/config": "9.*|10.*|^11.0", + "illuminate/validation": "9.*|10.*|^11.0", + "illuminate/database": "9.*|10.*|^11.0", + "illuminate/support": "9.*|10.*|^11.0", + "illuminate/http": "9.*|10.*|^11.0", + "illuminate/auth": "9.*|10.*|^11.0" }, "require-dev": { "laragear/meta-testing": "^1.3.1", - "orchestra/testbench": "^7.22|8.*" + "orchestra/testbench": "^7.22|8.*|^9.0" }, "autoload": { "psr-4": { @@ -61,7 +61,7 @@ "extra": { "laravel": { "providers": [ - "Laragear\\TwoFactor\\TwoFactorServiceProvider" + "Laragear\\TwoFactor\\TwoFactorServiceProvider" ] } }, From 02e0ce5cf05e2d57f9034686acb9de6c004d32ce Mon Sep 17 00:00:00 2001 From: Shift Date: Sat, 2 Mar 2024 08:11:34 +0000 Subject: [PATCH 2/2] Update GitHub Actions for Laravel 11 --- .github/workflows/php.yml | 254 +++++++++++++++++++++++++++----------- 1 file changed, 180 insertions(+), 74 deletions(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index d7a6a84..8d1379f 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -1,5 +1,3 @@ -# yaml-language-server: $schema=https://json.schemastore.org/github-workflow - name: Tests on: @@ -7,119 +5,227 @@ on: pull_request: jobs: - byte_level: - name: "0️⃣ Byte-level" - runs-on: "ubuntu-latest" + name: 0️⃣ Byte-level + + + + + + runs-on: ubuntu-latest + + + + + steps: - - name: "Checkout code" - uses: "actions/checkout@v3" + - name: Checkout code + uses: actions/checkout@v3 + + + - - name: "Check file permissions" + + - name: Check file permissions run: | test "$(find . -type f -not -path './.git/*' -executable)" == "" - - name: "Find non-printable ASCII characters" + + + + + + - name: Find non-printable ASCII characters run: | ! LC_ALL=C.UTF-8 find ./src -type f -name "*.php" -print0 | xargs -0 -- grep -PHn "[^ -~]" syntax_errors: - name: "1️⃣ Syntax errors" - runs-on: "ubuntu-latest" + name: 1️⃣ Syntax errors + + + + + + runs-on: ubuntu-latest + + + + + steps: - - name: "Set up PHP" - uses: "shivammathur/setup-php@v2" + - name: Set up PHP + uses: shivammathur/setup-php@v2 with: - php-version: "8.1" - tools: "parallel-lint" + php-version: '8.1' + tools: parallel-lint + + + + + + - name: Checkout code + uses: actions/checkout@v3 + + + + + + - name: Validate Composer configuration + run: composer validate --strict + + - - name: "Checkout code" - uses: "actions/checkout@v3" - - name: "Validate Composer configuration" - run: "composer validate --strict" - - name: "Check source code for syntax errors" - run: "composer exec -- parallel-lint src/" + - name: Check source code for syntax errors + run: composer exec -- parallel-lint src/ unit_tests: - name: "2️⃣ Unit and Feature tests" + name: 2️⃣ Unit and Feature tests + + + needs: - - "byte_level" - - "syntax_errors" - runs-on: "ubuntu-latest" + - byte_level + - syntax_errors + + + + + + runs-on: ubuntu-latest + strategy: matrix: - php-version: - - "8.0" - - "8.1" - - "8.2" - laravel-constraint: - - "9.*" - - "10.*" - dependencies: - - "lowest" - - "highest" + php-version: ['8.0', '8.1', '8.2'] + laravel-constraint: ['9.*', '10.*', '11.*'] + dependencies: [lowest, highest] exclude: - - php-version: "8.0" - laravel-constraint: "10.*" + - php-version: '8.0' + laravel-constraint: 10.* + - laravel-constraint: 11.* + php-version: '8.0' + - laravel-constraint: 11.* + php-version: '8.1' + + + + steps: - - name: "Set up PHP" - uses: "shivammathur/setup-php@v2" + - name: Set up PHP + uses: shivammathur/setup-php@v2 with: - php-version: "${{ matrix.php-version }}" - extensions: "mbstring, intl" - coverage: "xdebug" + php-version: ${{ matrix.php-version }} + extensions: mbstring, intl + coverage: xdebug + - - name: "Checkout code" - uses: "actions/checkout@v3" - - name: "Install dependencies" - uses: "ramsey/composer-install@v2" + + + - name: Checkout code + uses: actions/checkout@v3 + + + + + + - name: Install dependencies + uses: ramsey/composer-install@v2 with: - dependency-versions: "${{ matrix.dependencies }}" - composer-options: "--with=laravel/framework:${{ matrix.laravel-constraint }}" + dependency-versions: ${{ matrix.dependencies }} + composer-options: --with=laravel/framework:${{ matrix.laravel-constraint }} + + + + + + - name: Execute unit tests + run: composer run-script test + + + - - name: "Execute unit tests" - run: "composer run-script test" - - name: "Upload coverage to Codecov" - uses: "codecov/codecov-action@v3" + - name: Upload coverage to Codecov + uses: codecov/codecov-action@v3 static_analysis: - name: "3️⃣ Static Analysis" + name: 3️⃣ Static Analysis + + + needs: - - "byte_level" - - "syntax_errors" - runs-on: "ubuntu-latest" + - byte_level + - syntax_errors + + + + + + runs-on: ubuntu-latest + + + + + steps: - - name: "Set up PHP" - uses: "shivammathur/setup-php@v2" + - name: Set up PHP + uses: shivammathur/setup-php@v2 with: - tools: "phpstan" - php-version: "latest" - coverage: "none" + tools: phpstan + php-version: latest + coverage: none + - - name: "Checkout code" - uses: "actions/checkout@v3" - - name: "Install dependencies" - uses: "ramsey/composer-install@v2" - - name: "Execute static analysis" - run: "composer exec -- phpstan analyze -l 5 src/" + + - name: Checkout code + uses: actions/checkout@v3 + + + + + + - name: Install dependencies + uses: ramsey/composer-install@v2 + + + + + + - name: Execute static analysis + run: composer exec -- phpstan analyze -l 5 src/ exported_files: - name: "4️⃣ Exported files" + name: 4️⃣ Exported files + + + needs: - - "byte_level" - - "syntax_errors" - runs-on: "ubuntu-latest" + - byte_level + - syntax_errors + + + + + + runs-on: ubuntu-latest + + + + + steps: - - name: "Checkout code" - uses: "actions/checkout@v3" + - name: Checkout code + uses: actions/checkout@v3 + + + + - - name: "Check exported files" + - name: Check exported files run: | EXPECTED="LICENSE.md,README.md,composer.json" CURRENT="$(git archive HEAD | tar --list --exclude="src" --exclude="src/*" --exclude=".stubs" --exclude=".stubs/*" --exclude="routes" --exclude="routes/*" --exclude="stubs" --exclude="stubs/*" --exclude="lang" --exclude="lang/*" --exclude="config" --exclude="config/*" --exclude="database" --exclude="database/*" --exclude="resources" --exclude="resources/*" | paste -s -d ",")"