Merge branch '4.next' into 4.x

Author: markstory

.github/workflows/ci.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['7.2', '7.4', '8.0']
+        php-version: ['7.2', '7.4', '8.0', '8.1']
     name: PHP ${{ matrix.php-version }}
 
     steps:
@@ -26,17 +26,24 @@ jobs:
       uses: shivammathur/setup-php@v2
       with:
         php-version: ${{ matrix.php-version }}
-        extensions: mbstring, intl, pdo_sqlite, pdo_mysql
+        extensions: mbstring, intl, pdo_sqlite
         coverage: none
 
     - name: Composer install
       run: |
-        composer install
+        if [[ ${{ matrix.php-version }} == '8.1' ]]; then
+          composer update --ignore-platform-reqs
+        else
+          composer update
+        fi
         composer run-script post-install-cmd --no-interaction
 
     - name: Run PHPUnit
       run: |
-          vendor/bin/phpunit
+        cp config/app_local.example.php config/app_local.php
+        vendor/bin/phpunit
+      env:
+        DATABASE_TEST_URL: sqlite://./testdb.sqlite
 
   coding-standard:
     name: Coding Standard

composer.json

@@ -6,18 +6,18 @@
     "license": "MIT",
     "require": {
         "php": ">=7.2",
-        "cakephp/cakephp": "~4.2.0",
-        "cakephp/migrations": "^3.0",
+        "cakephp/cakephp": "dev-4.next as 4.3.0",
+        "cakephp/migrations": "dev-3.next as 3.2.0",
         "cakephp/plugin-installer": "^1.3",
         "mobiledetect/mobiledetectlib": "^2.8"
     },
     "require-dev": {
         "cakephp/bake": "^2.3",
-        "cakephp/cakephp-codesniffer": "~4.2.0",
-        "cakephp/debug_kit": "^4.4",
+        "cakephp/repl": "^0.1",
+        "cakephp/cakephp-codesniffer": "^4.5",
+        "cakephp/debug_kit": "dev-4.next as 4.5.0",
         "josegonzalez/dotenv": "^3.2",
-        "phpunit/phpunit": "^8.5 || ^9.3",
-        "psy/psysh": "@stable"
+        "phpunit/phpunit": "~8.5.0 || ^9.3"
     },
     "suggest": {
         "markstory/asset_compress": "An asset compression plugin which provides file concatenation and a flexible filter system for preprocessing and minification.",

config/app_local.example.php

@@ -70,7 +70,7 @@
             'password' => 'secret',
             'database' => 'test_myapp',
             //'schema' => 'myapp',
-            'url' => env('DATABASE_TEST_URL', null),
+            'url' => env('DATABASE_TEST_URL', 'sqlite://127.0.0.1/tests.sqlite'),
         ],
     ],
 

config/bootstrap.php

@@ -167,6 +167,8 @@
 
 /*
  * Setup detectors for mobile and tablet.
+ * If you don't use these checks you can safely remove this code
+ * and the mobiledetect package from composer.json.
  */
 ServerRequest::addDetector('mobile', function ($request) {
     $detector = new \Detection\MobileDetect();
@@ -180,31 +182,27 @@
 });
 
 /*
- * You can set whether the ORM uses immutable or mutable Time types.
- * The default changed in 4.0 to immutable types. You can uncomment
- * below to switch back to mutable types.
- *
  * You can enable default locale format parsing by adding calls
  * to `useLocaleParser()`. This enables the automatic conversion of
  * locale specific date formats. For details see
  * @link https://book.cakephp.org/4/en/core-libraries/internationalization-and-localization.html#parsing-localized-datetime-data
  */
 // \Cake\Database\TypeFactory::build('time')
-//    ->useMutable();
+//    ->useLocaleParser();
 // \Cake\Database\TypeFactory::build('date')
-//    ->useMutable();
+//    ->useLocaleParser();
 // \Cake\Database\TypeFactory::build('datetime')
-//    ->useMutable();
+//    ->useLocaleParser();
 // \Cake\Database\TypeFactory::build('timestamp')
-//    ->useMutable();
+//    ->useLocaleParser();
 // \Cake\Database\TypeFactory::build('datetimefractional')
-//    ->useMutable();
+//    ->useLocaleParser();
 // \Cake\Database\TypeFactory::build('timestampfractional')
-//    ->useMutable();
+//    ->useLocaleParser();
 // \Cake\Database\TypeFactory::build('datetimetimezone')
-//    ->useMutable();
+//    ->useLocaleParser();
 // \Cake\Database\TypeFactory::build('timestamptimezone')
-//    ->useMutable();
+//    ->useLocaleParser();
 
 // There is no time-specific type in Cake
 TypeFactory::map('time', StringType::class);

config/routes.php

@@ -24,67 +24,68 @@
 use Cake\Routing\Route\DashedRoute;
 use Cake\Routing\RouteBuilder;
 
-/*
- * The default class to use for all routes
- *
- * The following route classes are supplied with CakePHP and are appropriate
- * to set as the default:
- *
- * - Route
- * - InflectedRoute
- * - DashedRoute
- *
- * If no call is made to `Router::defaultRouteClass()`, the class used is
- * `Route` (`Cake\Routing\Route\Route`)
- *
- * Note that `Route` does not do any inflections on URLs which will result in
- * inconsistently cased URLs when used with `:plugin`, `:controller` and
- * `:action` markers.
- */
-/** @var \Cake\Routing\RouteBuilder $routes */
-$routes->setRouteClass(DashedRoute::class);
-
-$routes->scope('/', function (RouteBuilder $builder) {
+return static function (RouteBuilder $routes) {
     /*
-     * Here, we are connecting '/' (base path) to a controller called 'Pages',
-     * its action called 'display', and we pass a param to select the view file
-     * to use (in this case, templates/Pages/home.php)...
+     * The default class to use for all routes
+     *
+     * The following route classes are supplied with CakePHP and are appropriate
+     * to set as the default:
+     *
+     * - Route
+     * - InflectedRoute
+     * - DashedRoute
+     *
+     * If no call is made to `Router::defaultRouteClass()`, the class used is
+     * `Route` (`Cake\Routing\Route\Route`)
+     *
+     * Note that `Route` does not do any inflections on URLs which will result in
+     * inconsistently cased URLs when used with `:plugin`, `:controller` and
+     * `:action` markers.
      */
-    $builder->connect('/', ['controller' => 'Pages', 'action' => 'display', 'home']);
+    $routes->setRouteClass(DashedRoute::class);
 
-    /*
-     * ...and connect the rest of 'Pages' controller's URLs.
-     */
-    $builder->connect('/pages/*', 'Pages::display');
+    $routes->scope('/', function (RouteBuilder $builder) {
+        /*
+         * Here, we are connecting '/' (base path) to a controller called 'Pages',
+         * its action called 'display', and we pass a param to select the view file
+         * to use (in this case, templates/Pages/home.php)...
+         */
+        $builder->connect('/', ['controller' => 'Pages', 'action' => 'display', 'home']);
+
+        /*
+         * ...and connect the rest of 'Pages' controller's URLs.
+         */
+        $builder->connect('/pages/*', 'Pages::display');
+
+        /*
+         * Connect catchall routes for all controllers.
+         *
+         * The `fallbacks` method is a shortcut for
+         *
+         * ```
+         * $builder->connect('/:controller', ['action' => 'index']);
+         * $builder->connect('/:controller/:action/*', []);
+         * ```
+         *
+         * You can remove these routes once you've connected the
+         * routes you want in your application.
+         */
+        $builder->fallbacks();
+    });
 
     /*
-     * Connect catchall routes for all controllers.
+     * If you need a different set of middleware or none at all,
+     * open new scope and define routes there.
      *
-     * The `fallbacks` method is a shortcut for
-     *
-     * ```
-     * $builder->connect('/{controller}', ['action' => 'index']);
-     * $builder->connect('/{controller}/{action}/*', []);
      * ```
+     * $routes->scope('/api', function (RouteBuilder $builder) {
+     *     // No $builder->applyMiddleware() here.
      *
-     * You can remove these routes once you've connected the
-     * routes you want in your application.
+     *     // Parse specified extensions from URLs
+     *     // $builder->setExtensions(['json', 'xml']);
+     *
+     *     // Connect API actions here.
+     * });
+     * ```
      */
-    $builder->fallbacks();
-});
-
-/*
- * If you need a different set of middleware or none at all,
- * open new scope and define routes there.
- *
- * ```
- * $routes->scope('/api', function (RouteBuilder $builder) {
- *     // No $builder->applyMiddleware() here.
- *     
- *     // Parse specified extensions from URLs
- *     // $builder->setExtensions(['json', 'xml']);
- *     
- *     // Connect API actions here.
- * });
- * ```
- */
+};

phpunit.xml.dist

@@ -18,14 +18,10 @@
         <!-- Add plugin test suites here. -->
     </testsuites>
 
-    <!-- Setup a listener for fixtures -->
-    <listeners>
-        <listener class="Cake\TestSuite\Fixture\FixtureInjector">
-            <arguments>
-                <object class="Cake\TestSuite\Fixture\FixtureManager"/>
-            </arguments>
-        </listener>
-    </listeners>
+    <!-- Load extension for fixtures -->
+    <extensions>
+        <extension class="Cake\TestSuite\Fixture\PHPUnitExtension"/>
+    </extensions>
 
     <!-- Ignore vendor tests in code coverage reports -->
     <filter>

src/Application.php

@@ -18,7 +18,6 @@
 
 use Cake\Core\Configure;
 use Cake\Core\ContainerInterface;
-use Cake\Core\Exception\MissingPluginException;
 use Cake\Datasource\FactoryLocator;
 use Cake\Error\Middleware\ErrorHandlerMiddleware;
 use Cake\Http\BaseApplication;
@@ -127,11 +126,8 @@ public function services(ContainerInterface $container): void
      */
     protected function bootstrapCli(): void
     {
-        try {
-            $this->addPlugin('Bake');
-        } catch (MissingPluginException $e) {
-            // Do not halt if the plugin is missing
-        }
+        $this->addOptionalPlugin('Cake/Repl');
+        $this->addOptionalPlugin('Bake');
 
         $this->addPlugin('Migrations');
 

src/Command/ConsoleCommand.php

@@ -40,7 +40,8 @@ public function testBootstrap()
         $app->bootstrap();
         $plugins = $app->getPlugins();
 
-        $this->assertCount(3, $plugins);
+        $this->assertCount(4, $plugins);
+        $this->assertSame('Cake/Repl', $plugins->get('Cake/Repl')->getName());
         $this->assertSame('Bake', $plugins->get('Bake')->getName());
         $this->assertSame('DebugKit', $plugins->get('DebugKit')->getName());
         $this->assertSame('Migrations', $plugins->get('Migrations')->getName());