Starting to update to 4.4

Author: markstory

composer.lock

@@ -35,8 +35,8 @@
 use Cake\Core\Configure;
 use Cake\Core\Configure\Engine\PhpConfig;
 use Cake\Datasource\ConnectionManager;
-use Cake\Error\ConsoleErrorHandler;
-use Cake\Error\ErrorHandler;
+use Cake\Error\ErrorTrap;
+use Cake\Error\ExceptionTrap;
 use Cake\Http\ServerRequest;
 use Cake\Log\Log;
 use Cake\Mailer\Mailer;
@@ -120,17 +120,13 @@
 /*
  * Register application error and exception handlers.
  */
-$isCli = PHP_SAPI === 'cli';
-if ($isCli) {
-    (new ConsoleErrorHandler(Configure::read('Error')))->register();
-} else {
-    (new ErrorHandler(Configure::read('Error')))->register();
-}
+(new ErrorTrap())->register();
+(new ExceptionTrap())->register();
 
 /*
  * Include the CLI bootstrap overrides.
  */
-if ($isCli) {
+if (PHP_SAPI == 'cli') {
     require __DIR__ . '/bootstrap_cli.php';
 }
 
@@ -176,40 +172,3 @@
 
     return $detector->isTablet();
 });
-
-/*
- * 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
- */
-// TypeFactory::build('time')
-//    ->useMutable();
-// TypeFactory::build('date')
-//    ->useMutable();
-// TypeFactory::build('datetime')
-//    ->useMutable();
-// TypeFactory::build('timestamp')
-//    ->useMutable();
-// TypeFactory::build('datetimefractional')
-//    ->useMutable();
-// TypeFactory::build('timestampfractional')
-//    ->useMutable();
-// TypeFactory::build('datetimetimezone')
-//    ->useMutable();
-// TypeFactory::build('timestamptimezone')
-//    ->useMutable();
-
-/*
- * Custom Inflector rules, can be set to correctly pluralize or singularize
- * table, model, controller names or whatever other string is passed to the
- * inflection functions.
- */
-//Inflector::rules('plural', ['/^(inflect)or$/i' => '\1ables']);
-//Inflector::rules('irregular', ['red' => 'redlings']);
-//Inflector::rules('uninflected', ['dontinflectme']);
-//Inflector::rules('transliteration', ['/å/' => 'aa']);

config/bootstrap.php

@@ -43,7 +43,7 @@
  */
 Router::defaultRouteClass(DashedRoute::class);
 
-Router::scope('/', function (RouteBuilder $routes) {
+$routes->scope('/', function (RouteBuilder $routes) {
     // Register scoped middleware for in scopes.
     $routes->registerMiddleware('csrf', new CsrfProtectionMiddleware([
         'httponly' => true

config/routes.php

@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<ruleset name="PHP_CodeSniffer">
+    <config name="installed_paths" value="../../cakephp/cakephp-codesniffer" />
+
+    <rule ref="CakePHP" />
+
+    <!-- Necessary for class aliases used for backwards compat -->
+    <rule ref="PSR1.Files.SideEffects.FoundWithSymbols">
+        <severity>0</severity>
+    </rule>
+
+    <file>./src</file>
+    <file>./tests</file>
+
+    <arg name="extensions" value="php"/>
+</ruleset>

phpcs.xml

@@ -29,6 +29,7 @@
 use Cake\Http\BaseApplication;
 use Cake\Routing\Middleware\AssetMiddleware;
 use Cake\Routing\Middleware\RoutingMiddleware;
+use Cake\Routing\Router;
 
 /**
  * Application setup class.
@@ -128,7 +129,7 @@ public function middleware($middlewareQueue): \Cake\Http\MiddlewareQueue
     public function getAuthenticationService(ServerRequestInterface $request): AuthenticationServiceInterface
     {
         $authenticationService = new AuthenticationService([
-            'unauthenticatedRedirect' => '/users/login',
+            'unauthenticatedRedirect' => Router::url('/users/login'),
             'queryParam' => 'redirect',
         ]);
 
@@ -137,7 +138,7 @@ public function getAuthenticationService(ServerRequestInterface $request): Authe
             'fields' => [
                 'username' => 'email',
                 'password' => 'password',
-            ]
+            ],
         ]);
 
         // Load the authenticators, you want session first

src/Application.php

@@ -1,56 +1,52 @@
 <?php
-namespace App\Controller;
+declare(strict_types=1);
 
-use App\Controller\AppController;
+namespace App\Controller;
 
 /**
  * Tags Controller
  *
  * @property \App\Model\Table\TagsTable $Tags
- *
- * @method \App\Model\Entity\Tag[] paginate($object = null, array $settings = [])
+ * @method \App\Model\Entity\Tag[]|\Cake\Datasource\ResultSetInterface paginate($object = null, array $settings = [])
  */
 class TagsController extends AppController
 {
-
     /**
      * Index method
      *
-     * @return \Cake\Http\Response|void
+     * @return \Cake\Http\Response|null|void Renders view
      */
     public function index()
     {
         $tags = $this->paginate($this->Tags);
 
         $this->set(compact('tags'));
-        $this->set('_serialize', ['tags']);
     }
 
     /**
      * View method
      *
      * @param string|null $id Tag id.
-     * @return \Cake\Http\Response|void
+     * @return \Cake\Http\Response|null|void Renders view
      * @throws \Cake\Datasource\Exception\RecordNotFoundException When record not found.
      */
     public function view($id = null)
     {
         $tag = $this->Tags->get($id, [
-            'contain' => ['Articles']
+            'contain' => ['Articles'],
         ]);
 
-        $this->set('tag', $tag);
-        $this->set('_serialize', ['tag']);
+        $this->set(compact('tag'));
     }
 
     /**
      * Add method
      *
-     * @return \Cake\Http\Response|null Redirects on successful add, renders view otherwise.
+     * @return \Cake\Http\Response|null|void Redirects on successful add, renders view otherwise.
      */
     public function add()
     {
-        $tag = $this->Tags->newEntity();
+        $tag = $this->Tags->newEmptyEntity();
         if ($this->request->is('post')) {
             $tag = $this->Tags->patchEntity($tag, $this->request->getData());
             if ($this->Tags->save($tag)) {
@@ -62,20 +58,19 @@ public function add()
         }
         $articles = $this->Tags->Articles->find('list', ['limit' => 200]);
         $this->set(compact('tag', 'articles'));
-        $this->set('_serialize', ['tag']);
     }
 
     /**
      * Edit method
      *
      * @param string|null $id Tag id.
-     * @return \Cake\Http\Response|null Redirects on successful edit, renders view otherwise.
-     * @throws \Cake\Network\Exception\NotFoundException When record not found.
+     * @return \Cake\Http\Response|null|void Redirects on successful edit, renders view otherwise.
+     * @throws \Cake\Datasource\Exception\RecordNotFoundException When record not found.
      */
     public function edit($id = null)
     {
         $tag = $this->Tags->get($id, [
-            'contain' => ['Articles']
+            'contain' => ['Articles'],
         ]);
         if ($this->request->is(['patch', 'post', 'put'])) {
             $tag = $this->Tags->patchEntity($tag, $this->request->getData());
@@ -88,14 +83,13 @@ public function edit($id = null)
         }
         $articles = $this->Tags->Articles->find('list', ['limit' => 200]);
         $this->set(compact('tag', 'articles'));
-        $this->set('_serialize', ['tag']);
     }
 
     /**
      * Delete method
      *
      * @param string|null $id Tag id.
-     * @return \Cake\Http\Response|null Redirects to index.
+     * @return \Cake\Http\Response|null|void Redirects to index.
      * @throws \Cake\Datasource\Exception\RecordNotFoundException When record not found.
      */
     public function delete($id = null)

src/Controller/TagsController.php

@@ -1,30 +1,45 @@
 <?php
-// src/Model/Entity/Article.php
+declare(strict_types=1);
+
 namespace App\Model\Entity;
 
-use Cake\Collection\Collection;
 use Cake\ORM\Entity;
 
+/**
+ * Article Entity
+ *
+ * @property int $id
+ * @property int $user_id
+ * @property string $title
+ * @property string $slug
+ * @property string|null $body
+ * @property bool|null $published
+ * @property \Cake\I18n\FrozenTime|null $created
+ * @property \Cake\I18n\FrozenTime|null $modified
+ *
+ * @property \App\Model\Entity\User $user
+ * @property \App\Model\Entity\Tag[] $tags
+ */
 class Article extends Entity
 {
+    /**
+     * Fields that can be mass assigned using newEntity() or patchEntity().
+     *
+     * Note that when '*' is set to true, this allows all unspecified fields to
+     * be mass assigned. For security purposes, it is advised to set '*' to false
+     * (or remove it), and explicitly make individual fields accessible as needed.
+     *
+     * @var array
+     */
     protected $_accessible = [
-        '*' => true,
-        'id' => false,
-        'slug' => false,
+        'user_id' => true,
+        'title' => true,
+        'slug' => true,
+        'body' => true,
+        'published' => true,
+        'created' => true,
+        'modified' => true,
+        'user' => true,
+        'tags' => true,
     ];
-
-    protected function _getTagString()
-    {
-        if (isset($this->_fields['tag_string'])) {
-            return $this->_fields['tag_string'];
-        }
-        if (empty($this->tags)) {
-            return '';
-        }
-        $tags = new Collection($this->tags);
-        $str = $tags->reduce(function ($string, $tag) {
-            return $string . $tag->title . ', ';
-        }, '');
-        return trim($str, ', ');
-    }
 }

src/Model/Entity/Article.php

@@ -0,0 +1,32 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Model\Entity;
+
+use Cake\ORM\Entity;
+
+/**
+ * ArticlesTag Entity
+ *
+ * @property int $article_id
+ * @property int $tag_id
+ *
+ * @property \App\Model\Entity\Article $article
+ * @property \App\Model\Entity\Tag $tag
+ */
+class ArticlesTag extends Entity
+{
+    /**
+     * Fields that can be mass assigned using newEntity() or patchEntity().
+     *
+     * Note that when '*' is set to true, this allows all unspecified fields to
+     * be mass assigned. For security purposes, it is advised to set '*' to false
+     * (or remove it), and explicitly make individual fields accessible as needed.
+     *
+     * @var array
+     */
+    protected $_accessible = [
+        'article' => true,
+        'tag' => true,
+    ];
+}

src/Model/Entity/ArticlesTag.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace App\Model\Entity;
 
 use Cake\ORM\Entity;
@@ -7,15 +9,14 @@
  * Tag Entity
  *
  * @property int $id
- * @property string $title
- * @property \Cake\I18n\FrozenTime $created
- * @property \Cake\I18n\FrozenTime $modified
+ * @property string|null $title
+ * @property \Cake\I18n\FrozenTime|null $created
+ * @property \Cake\I18n\FrozenTime|null $modified
  *
  * @property \App\Model\Entity\Article[] $articles
  */
 class Tag extends Entity
 {
-
     /**
      * Fields that can be mass assigned using newEntity() or patchEntity().
      *
@@ -26,7 +27,9 @@ class Tag extends Entity
      * @var array
      */
     protected $_accessible = [
-        '*' => true,
-        'id' => false
+        'title' => true,
+        'created' => true,
+        'modified' => true,
+        'articles' => true,
     ];
 }