Merge pull request #7849 from codeigniter4/develop

4.3.8 Ready code
codeigniter4 · Aug 25, 2023 · bda1f59 · bda1f59
2 parents f491f66 + 3e45037
commit bda1f59
Show file tree

Hide file tree

Showing 231 changed files with 2,607 additions and 1,973 deletions.
diff --git a/.github/workflows/deploy-apidocs.yml b/.github/workflows/deploy-apidocs.yml
@@ -43,13 +43,13 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.0'
+          php-version: '8.1'
           tools: phive
           coverage: none
 
       - name: Download latest phpDocumentor
         working-directory: source
-        run: sudo phive --no-progress install --global --trust-gpg-keys 67F861C3D889C656 phpDocumentor
+        run: phive --no-progress install --trust-gpg-keys 8AC0BAA79732DD42 phpDocumentor
 
       - name: Prepare API repo
         working-directory: api
@@ -61,7 +61,7 @@ jobs:
       - name: Build API in source repo
         working-directory: source
         run: |
-          phpDocumentor run --ansi --verbose
+          php tools/phpDocumentor run --ansi --verbose
           cp -R ${GITHUB_WORKSPACE}/source/api/build/* ${GITHUB_WORKSPACE}/api/docs
 
       - name: Deploy to API repo

diff --git a/.github/workflows/test-autoreview.yml b/.github/workflows/test-autoreview.yml
@@ -29,3 +29,79 @@ jobs:
       php-version: '8.1'
       job-id: auto-review-tests
       group-name: AutoReview
+
+  composer-normalize-tests:
+    name: Check normalized composer.json
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.1'
+
+      - name: Install dependencies
+        run: composer update
+
+      - name: Run on root composer.json
+        id: normalize-root-composer
+        if: ${{ always() }}
+        run: |
+          echo "ROOT_COMPOSER_RESULT<<RCR" >> $GITHUB_OUTPUT
+          echo "$(composer normalize)" >> $GITHUB_OUTPUT
+          echo "RCR" >> $GITHUB_OUTPUT
+
+      - name: Run on framework composer.json
+        id: normalize-framework-composer
+        if: ${{ always() }}
+        working-directory: admin/framework
+        run: |
+          echo "FRAMEWORK_COMPOSER_RESULT<<FCR" >> $GITHUB_OUTPUT
+          echo "$(composer normalize)" >> $GITHUB_OUTPUT
+          echo "FCR" >> $GITHUB_OUTPUT
+
+      - name: Run on starter composer.json
+        id: normalize-starter-composer
+        if: ${{ always() }}
+        working-directory: admin/starter
+        run: |
+          echo "STARTER_COMPOSER_RESULT<<SCR" >> $GITHUB_OUTPUT
+          echo "$(composer normalize)" >> $GITHUB_OUTPUT
+          echo "SCR" >> $GITHUB_OUTPUT
+
+      - name: Analyse normalization results
+        run: |
+          if [[ '${{ steps.normalize-root-composer.conclusion }}' == 'failure' ]]; then
+            echo 'Normalization of root composer.json encountered a problem.';
+            echo 'Please run it locally: `composer normalize`';
+            exit 1;
+          fi
+
+          if [[ ${{ contains(steps.normalize-root-composer.outputs.ROOT_COMPOSER_RESULT, 'Successfully normalized') }} == true ]]; then
+            echo 'Root composer.json is not yet normalized.';
+            exit 1;
+          fi
+
+          if [[ '${{ steps.normalize-framework-composer.conclusion }}' == 'failure' ]]; then
+            echo 'Normalization of framework composer.json encountered a problem.';
+            echo 'Please run it locally: `composer normalize -d admin/framework`';
+            exit 1;
+          fi
+
+          if [[ ${{ contains(steps.normalize-framework-composer.outputs.FRAMEWORK_COMPOSER_RESULT, 'Successfully normalized') }} == true ]]; then
+            echo 'Framework composer.json is not yet normalized.';
+            exit 1;
+          fi
+
+          if [[ '${{ steps.normalize-starter-composer.conclusion }}' == 'failure' ]]; then
+            echo 'Normalization of starter composer.json encountered a problem.';
+            echo 'Please run it locally: `composer normalize -d admin/starter`';
+            exit 1;
+          fi
+
+          if [[ ${{ contains(steps.normalize-starter-composer.outputs.STARTER_COMPOSER_RESULT, 'Successfully normalized') }} == true ]]; then
+            echo 'Starter composer.json is not yet normalized.';
+            exit 1;
+          fi
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -44,6 +44,11 @@
     ]);
 
 $overrides = [
+    'php_unit_data_provider_name' => [
+        'prefix' => 'provide',
+        'suffix' => '',
+    ],
+    'php_unit_data_provider_static'      => true,
     'php_unit_data_provider_return_type' => true,
     'no_extra_blank_lines'               => [
         'tokens' => [

diff --git a/.php-cs-fixer.no-header.php b/.php-cs-fixer.no-header.php
@@ -30,6 +30,11 @@
     ]);
 
 $overrides = [
+    'php_unit_data_provider_name' => [
+        'prefix' => 'provide',
+        'suffix' => '',
+    ],
+    'php_unit_data_provider_static'      => true,
     'php_unit_data_provider_return_type' => true,
     'no_extra_blank_lines'               => [
         'tokens' => [

diff --git a/.php-cs-fixer.user-guide.php b/.php-cs-fixer.user-guide.php
@@ -53,6 +53,11 @@
             'use',
         ],
     ],
+    'php_unit_data_provider_static' => true,
+    'php_unit_data_provider_name'   => [
+        'prefix' => 'provide',
+        'suffix' => '',
+    ],
 ];
 
 $options = [

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,24 @@
 # Changelog
 
+## [v4.3.8](https://github.com/codeigniter4/CodeIgniter4/tree/v4.3.8) (2023-08-25)
+[Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.3.7...v4.3.8)
+
+### Fixed Bugs
+
+* fix: [Pager] knocks down variables for View by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7758
+* fix: Model::insertBatch() causes error to non auto increment table by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7759
+* fix: [Model] updateBatch() may generate invalid SQL statement by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7787
+* fix: Model inserts cast $primaryKey value when using Entity by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7806
+* fix: instances of Validation rules are incremented each time `run()` is executed by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7815
+* fix: filter except empty by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7823
+* fix: `set_checkbox()` checks unchecked checkbox by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7818
+
+### Refactoring
+
+* Normalize data provider names by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/7656
+* refactor: remove Model::$tempPrimaryKeyValue by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/7760
+* Remove unused cast on RedisHandler by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/7786
+
 ## [v4.3.7](https://github.com/codeigniter4/CodeIgniter4/tree/v4.3.7) (2023-07-30)
 [Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.3.6...v4.3.7)
 

diff --git a/admin/RELEASE.md b/admin/RELEASE.md
@@ -55,6 +55,7 @@ the existing content.
     ```
 * Vet the **admin/** folders for any removed hidden files (Action deploy scripts
   *do not remove these*)
+  * git diff --name-status origin/master admin/
 * Merge any Security Advisory PRs in private forks
 
 ## Process

diff --git a/admin/framework/composer.json b/admin/framework/composer.json
@@ -1,9 +1,14 @@
 {
     "name": "codeigniter4/framework",
-    "type": "project",
     "description": "The CodeIgniter framework v4",
-    "homepage": "https://codeigniter.com",
     "license": "MIT",
+    "type": "project",
+    "homepage": "https://codeigniter.com",
+    "support": {
+        "forum": "https://forum.codeigniter.com/",
+        "source": "https://github.com/codeigniter4/CodeIgniter4",
+        "slack": "https://codeigniterchat.slack.com"
+    },
     "require": {
         "php": "^7.4 || ^8.0",
         "ext-intl": "*",
@@ -13,39 +18,34 @@
         "psr/log": "^1.1"
     },
     "require-dev": {
-        "kint-php/kint": "^5.0.4",
         "codeigniter/coding-standard": "^1.5",
         "fakerphp/faker": "^1.9",
         "friendsofphp/php-cs-fixer": "3.13.0",
+        "kint-php/kint": "^5.0.4",
         "mikey179/vfsstream": "^1.6",
         "nexusphp/cs-config": "^3.6",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1 || ^2.0"
     },
     "suggest": {
         "ext-curl": "If you use CURLRequest class",
-        "ext-imagick": "If you use Image class ImageMagickHandler",
-        "ext-gd": "If you use Image class GDHandler",
+        "ext-dom": "If you use TestResponse",
         "ext-exif": "If you run Image class tests",
-        "ext-simplexml": "If you format XML",
+        "ext-fileinfo": "Improves mime type detection for files",
+        "ext-gd": "If you use Image class GDHandler",
+        "ext-imagick": "If you use Image class ImageMagickHandler",
+        "ext-libxml": "If you use TestResponse",
+        "ext-memcache": "If you use Cache class MemcachedHandler with Memcache",
+        "ext-memcached": "If you use Cache class MemcachedHandler with Memcached",
         "ext-mysqli": "If you use MySQL",
         "ext-oci8": "If you use Oracle Database",
         "ext-pgsql": "If you use PostgreSQL",
-        "ext-sqlsrv": "If you use SQL Server",
-        "ext-sqlite3": "If you use SQLite3",
-        "ext-memcache": "If you use Cache class MemcachedHandler with Memcache",
-        "ext-memcached": "If you use Cache class MemcachedHandler with Memcached",
+        "ext-readline": "Improves CLI::input() usability",
         "ext-redis": "If you use Cache class RedisHandler",
-        "ext-dom": "If you use TestResponse",
-        "ext-libxml": "If you use TestResponse",
-        "ext-xdebug": "If you use CIUnitTestCase::assertHeaderEmitted()",
-        "ext-fileinfo": "Improves mime type detection for files",
-        "ext-readline": "Improves CLI::input() usability"
-    },
-    "config": {
-        "optimize-autoloader": true,
-        "preferred-install": "dist",
-        "sort-packages": true
+        "ext-simplexml": "If you format XML",
+        "ext-sqlite3": "If you use SQLite3",
+        "ext-sqlsrv": "If you use SQL Server",
+        "ext-xdebug": "If you use CIUnitTestCase::assertHeaderEmitted()"
     },
     "autoload": {
         "psr-4": {
@@ -55,12 +55,12 @@
             "**/Database/Migrations/**"
         ]
     },
+    "config": {
+        "optimize-autoloader": true,
+        "preferred-install": "dist",
+        "sort-packages": true
+    },
     "scripts": {
         "test": "phpunit"
-    },
-    "support": {
-        "forum": "https://forum.codeigniter.com/",
-        "source": "https://github.com/codeigniter4/CodeIgniter4",
-        "slack": "https://codeigniterchat.slack.com"
     }
 }
diff --git a/admin/starter/composer.json b/admin/starter/composer.json
@@ -1,9 +1,14 @@
 {
     "name": "codeigniter4/appstarter",
-    "type": "project",
     "description": "CodeIgniter4 starter app",
-    "homepage": "https://codeigniter.com",
     "license": "MIT",
+    "type": "project",
+    "homepage": "https://codeigniter.com",
+    "support": {
+        "forum": "https://forum.codeigniter.com/",
+        "source": "https://github.com/codeigniter4/CodeIgniter4",
+        "slack": "https://codeigniterchat.slack.com"
+    },
     "require": {
         "php": "^7.4 || ^8.0",
         "codeigniter4/framework": "^4.0"
@@ -13,11 +18,6 @@
         "mikey179/vfsstream": "^1.6",
         "phpunit/phpunit": "^9.1"
     },
-    "config": {
-        "optimize-autoloader": true,
-        "preferred-install": "dist",
-        "sort-packages": true
-    },
     "autoload": {
         "exclude-from-classmap": [
             "**/Database/Migrations/**"
@@ -28,12 +28,12 @@
             "Tests\\Support\\": "tests/_support"
         }
     },
+    "config": {
+        "optimize-autoloader": true,
+        "preferred-install": "dist",
+        "sort-packages": true
+    },
     "scripts": {
         "test": "phpunit"
-    },
-    "support": {
-        "forum": "https://forum.codeigniter.com/",
-        "source": "https://github.com/codeigniter4/CodeIgniter4",
-        "slack": "https://codeigniterchat.slack.com"
     }
 }