cakephp/app を最新にアップデート

.editorconfig

@@ -16,3 +16,6 @@ end_of_line = crlf
 [*.yml]
 indent_style = space
 indent_size = 2
+
+[*.twig]
+insert_final_newline = false

.gitattributes

@@ -40,3 +40,7 @@
 *.ttf binary
 *.otf binary
 *.eot binary
+*.gz binary
+*.bz2 binary
+*.7z binary
+*.zip binary

.github/ISSUE_TEMPLATE.md

@@ -16,7 +16,7 @@ EXPLAIN WHAT IS ACTUALLY HAPPENING, HERE.
 ### What you expected to happen
 EXPLAIN WHAT IS TO BE EXPECTED, HERE.
 
-P.S. Remember, an issue is not the place to ask questions. You can use [Stack Overflow](http://stackoverflow.com/questions/tagged/cakephp)
+P.S. Remember, an issue is not the place to ask questions. You can use [Stack Overflow](https://stackoverflow.com/questions/tagged/cakephp)
 for that or join the #cakephp channel on irc.freenode.net, where we will be more
 than happy to help answer your questions.
 

.gitignore

@@ -1,5 +1,40 @@
-/vendor/*
+# CakePHP specific files #
+##########################
 /config/app.php
-/tmp/*
+/config/.env
 /logs/*
-.idea
+/tmp/*
+/vendor/*
+
+# OS generated files #
+######################
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+Icon?
+ehthumbs.db
+Thumbs.db
+
+# Tool specific files #
+#######################
+# vim
+*~
+*.swp
+*.swo
+# sublime text & textmate
+*.sublime-*
+*.stTheme.cache
+*.tmlanguage.cache
+*.tmPreferences.cache
+# Eclipse
+.settings/*
+# JetBrains, aka PHPStorm, IntelliJ IDEA
+.idea/*
+# NetBeans
+nbproject/*
+# Visual Studio Code
+.vscode
+# Sass preprocessor
+.sass-cache/

.htaccess

@@ -6,6 +6,7 @@
 
 <IfModule mod_rewrite.c>
     RewriteEngine on
+    RewriteRule    ^(\.well-known/.*)$ $1 [L]
     RewriteRule    ^$    webroot/    [L]
     RewriteRule    (.*) webroot/$1    [L]
 </IfModule>

README.md

@@ -1,10 +1,24 @@
 # Project to migrate baserCMS to CakePHP3
 
-[![License](https://img.shields.io/packagist/l/cakephp/app.svg?style=flat-square)](https://packagist.org/packages/cakephp/app)
+[![License](https://img.shields.io/packagist/l/cakephp/app.svg?style=flat-square)](https://packagist.org/packages/ryuring/basercake3)
+
+baserCMSをCakePHP3化するためのプロジェクトです。  
+ソースコードはこちらから確認できます。: [cakephp/cakephp](https://github.com/ryuring/basercake3).
 
 ## 開発に協力する準備
-- MySQLでデータベースを用意
-- `/.assets/basercake3.sql` をデータベースに流し込む
-- `/config/app.php` でデータベースへの接続設定を更新する
-- ブラウザで、/baser/admin/users/index にアクセスする
-- これからどうするか考える
+
+1. MySQLでデータベースを用意します。
+2. `/.assets/basercake3.sql` をデータベースに流し込みます。
+3. `/config/app.php` でデータベースへの接続設定を更新します。
+4. ブラウザで、/baser/admin/users/index にアクセスして表示を確認します。
+5. これからどうするか考える
+
+マシンのWebサーバーを使用してデフォルトのホームページを表示するか、組み込みWebサーバーを以下のように起動することができます。
+
+```bash
+bin/cake server -p 8765
+```
+
+その後、 `http://localhost:8765` にアクセスしてようこそページを表示してください。
+
+

bin/cake

@@ -3,17 +3,17 @@
 #
 # Cake is a shell script for invoking CakePHP shell commands
 #
-# CakePHP(tm) :  Rapid Development Framework (http://cakephp.org)
-# Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+# CakePHP(tm) :  Rapid Development Framework (https://cakephp.org)
+# Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
 #
 # Licensed under The MIT License
 # For full copyright and license information, please see the LICENSE.txt
 # Redistributions of files must retain the above copyright notice.
 #
-# @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
-# @link          http://cakephp.org CakePHP(tm) Project
+# @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+# @link          https://cakephp.org CakePHP(tm) Project
 # @since         1.2.0
-# @license       http://www.opensource.org/licenses/mit-license.php MIT License
+# @license       https://opensource.org/licenses/mit-license.php MIT License
 #
 ################################################################################
 

bin/cake.bat

@@ -2,16 +2,16 @@
 ::
 :: Cake is a Windows batch script for invoking CakePHP shell commands
 ::
-:: CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
-:: Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+:: CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+:: Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
 ::
 :: Licensed under The MIT License
 :: Redistributions of files must retain the above copyright notice.
 ::
-:: @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
-:: @link          http://cakephp.org CakePHP(tm) Project
+:: @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+:: @link          https://cakephp.org CakePHP(tm) Project
 :: @since         2.0.0
-:: @license       http://www.opensource.org/licenses/mit-license.php MIT License
+:: @license       https://opensource.org/licenses/mit-license.php MIT License
 ::
 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 

bin/cake.php

@@ -1,34 +1,12 @@
 #!/usr/bin/php -q
 <?php
-/**
- * Command-line code generation utility to automate programmer chores.
- *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- *
- * Licensed under The MIT License
- * For full copyright and license information, please see the LICENSE.txt
- * Redistributions of files must retain the above copyright notice.
- *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
- * @since         2.0.0
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
- */
-
-$minVersion = '5.6.0';
-if (file_exists('composer.json')) {
-    $composer = json_decode(file_get_contents('composer.json'));
-    if (isset($composer->require->php)) {
-        $minVersion = preg_replace('/([^0-9\.])/', '', $composer->require->php);
-    }
-}
-if (version_compare(phpversion(), $minVersion, '<')) {
-    fwrite(STDERR, sprintf("Minimum PHP version: %s. You are using: %s.\n", $minVersion, phpversion()));
-    exit(-1);
-}
-
+// Check platform requirements
+require dirname(__DIR__) . '/config/requirements.php';
 require dirname(__DIR__) . '/vendor/autoload.php';
-include dirname(__DIR__) . '/config/bootstrap.php';
 
-exit(Cake\Console\ShellDispatcher::run($argv));
+use App\Application;
+use Cake\Console\CommandRunner;
+
+// Build the runner with an application and root executable name.
+$runner = new CommandRunner(new Application(dirname(__DIR__) . '/config'), 'cake');
+exit($runner->run($argv));

composer.json

@@ -6,32 +6,35 @@
     "license": "MIT",
     "require": {
         "php": ">=5.6",
-        "cakephp/cakephp": "3.4.*",
-        "mobiledetect/mobiledetectlib": "2.*",
-        "cakephp/migrations": "~1.0",
-        "cakephp/plugin-installer": "*"
+        "cakephp/cakephp": "3.5.*",
+        "cakephp/migrations": "^1.0",
+        "cakephp/plugin-installer": "^1.0",
+        "josegonzalez/dotenv": "2.*",
+        "mobiledetect/mobiledetectlib": "2.*"
     },
     "require-dev": {
-        "psy/psysh": "@stable",
-        "cakephp/debug_kit": "~3.2",
-        "cakephp/bake": "~1.1"
+        "cakephp/bake": "^1.1",
+        "cakephp/cakephp-codesniffer": "^3.0",
+        "cakephp/debug_kit": "^3.2",
+        "psy/psysh": "@stable"
     },
     "suggest": {
         "markstory/asset_compress": "An asset compression plugin which provides file concatenation and a flexible filter system for preprocessing and minification.",
+        "dereuromark/cakephp-ide-helper": "After baking your code, this keeps your annotations in sync with the code evolving from there on for maximum IDE and PHPStan compatibility.",
         "phpunit/phpunit": "Allows automated tests to be run without system-wide install.",
         "cakephp/cakephp-codesniffer": "Allows to check the code against the coding standards used in CakePHP."
     },
     "autoload": {
         "psr-4": {
-            "App\\": "src",
-            "Baser\\": "./plugins/Baser/src"
+            "App\\": "src/",
+            "Baser\\": "plugins/Baser/src/"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "App\\Test\\": "tests",
-            "Cake\\Test\\": "./vendor/cakephp/cakephp/tests",
-            "Baser\\Test\\": "./plugins/Baser/tests"
+            "App\\Test\\": "tests/",
+            "Cake\\Test\\": "vendor/cakephp/cakephp/tests/",
+            "Baser\\Test\\": "plugins/Baser/tests/"
         }
     },
     "scripts": {
@@ -46,5 +49,8 @@
         "cs-fix": "phpcbf --colors --standard=vendor/cakephp/cakephp-codesniffer/CakePHP ./src ./tests",
         "test": "phpunit --colors=always"
     },
-    "prefer-stable": true
+    "prefer-stable": true,
+    "config": {
+        "sort-packages": true
+    }
 }

config/.env.default

@@ -0,0 +1,34 @@
+#!/usr/bin/env bash
+# Used as a default to seed config/.env which
+# enables you to use environment variables to configure
+# the aspects of your application that vary by
+# environment.
+#
+# To use this file, first copy it into `config/.env`. Also ensure the related
+# code block for loading this file is uncommented in `config/boostrap.php`
+#
+# In development .env files are parsed by PHP
+# and set into the environment. This provides a simpler
+# development workflow over standard environment variables.
+export APP_NAME="__APP_NAME__"
+export DEBUG="true"
+export APP_ENCODING="UTF-8"
+export APP_DEFAULT_LOCALE="en_US"
+export SECURITY_SALT="__SALT__"
+
+# Uncomment these to define cache configuration via environment variables.
+#export CACHE_DURATION="+2 minutes"
+#export CACHE_DEFAULT_URL="file://tmp/cache/?prefix=${APP_NAME}_default&duration=${CACHE_DURATION}"
+#export CACHE_CAKECORE_URL="file://tmp/cache/persistent?prefix=${APP_NAME}_cake_core&serialize=true&duration=${CACHE_DURATION}"
+#export CACHE_CAKEMODEL_URL="file://tmp/cache/models?prefix=${APP_NAME}_cake_model&serialize=true&duration=${CACHE_DURATION}"
+
+# Uncomment these to define email transport configuration via environment variables.
+#export EMAIL_TRANSPORT_DEFAULT_URL=""
+
+# Uncomment these to define database configuration via environment variables.
+#export DATABASE_URL="mysql://my_app:secret@localhost/${APP_NAME}?encoding=utf8&timezone=UTC&cacheMetadata=true&quoteIdentifiers=false&persistent=false"
+#export DATABASE_TEST_URL="mysql://my_app:secret@localhost/test_${APP_NAME}?encoding=utf8&timezone=UTC&cacheMetadata=true&quoteIdentifiers=false&persistent=false"
+
+# Uncomment these to define logging configuration via environment variables.
+#export LOG_DEBUG_URL="file://logs?levels[]=notice&levels[]=info&levels[]=debug&file=debug"
+#export LOG_ERROR_URL="file://logs?levels[]=warning&levels[]=error&levels[]=critical&levels[]=alert&levels[]=emergency&file=error"

config/app.default.php

@@ -183,8 +183,8 @@
             'host' => 'localhost',
             'port' => 25,
             'timeout' => 30,
-            'username' => 'user',
-            'password' => 'secret',
+            'username' => null,
+            'password' => null,
             'client' => null,
             'tls' => null,
             'url' => env('EMAIL_TRANSPORT_DEFAULT_URL', null),
@@ -290,15 +290,25 @@
             'className' => 'Cake\Log\Engine\FileLog',
             'path' => LOGS,
             'file' => 'debug',
-            'levels' => ['notice', 'info', 'debug'],
             'url' => env('LOG_DEBUG_URL', null),
+            'scopes' => false,
+            'levels' => ['notice', 'info', 'debug'],
         ],
         'error' => [
             'className' => 'Cake\Log\Engine\FileLog',
             'path' => LOGS,
             'file' => 'error',
-            'levels' => ['warning', 'error', 'critical', 'alert', 'emergency'],
             'url' => env('LOG_ERROR_URL', null),
+            'scopes' => false,
+            'levels' => ['warning', 'error', 'critical', 'alert', 'emergency'],
+        ],
+        // To enable this dedicated query log, you need set your datasource's log flag to true
+        'queries' => [
+            'className' => 'Cake\Log\Engine\FileLog',
+            'path' => LOGS,
+            'file' => 'queries',
+            'url' => env('LOG_QUERIES_URL', null),
+            'scopes' => ['queriesLog'],
         ],
     ],
 
@@ -311,7 +321,8 @@
      *
      * ## Options
      *
-     * - `cookie` - The name of the cookie to use. Defaults to 'CAKEPHP'.
+     * - `cookie` - The name of the cookie to use. Defaults to 'CAKEPHP'. Avoid using `.` in cookie names,
+     *   as PHP will drop sessions from cookies with `.` in the name.
      * - `cookiePath` - The url path for which session cookie is set. Maps to the
      *   `session.cookie_path` php.ini config. Defaults to base path of app.
      * - `timeout` - The time in minutes the session should be valid for.
@@ -338,7 +349,7 @@
      * Make sure the class implements PHP's `SessionHandlerInterface` and set
      * Session.handler to <name>
      *
-     * To use database sessions, load the SQL file located at config/Schema/sessions.sql
+     * To use database sessions, load the SQL file located at config/schema/sessions.sql
      */
     'Session' => [
         'defaults' => 'php',