Update CakePHP to v3.8.3 (NOJIRA)

COmanage · Sep 10, 2019 · 7dcb3d4 · 7dcb3d4
1 parent 3167474
commit 7dcb3d4
Show file tree

Hide file tree

Showing 377 changed files with 13,043 additions and 3,640 deletions.
diff --git a/app/composer.json b/app/composer.json
@@ -7,7 +7,7 @@
     "require": {
         "php": ">=5.6",
         "adodb/adodb-php": "^5.20",
-        "cakephp/cakephp": "3.6.*",
+        "cakephp/cakephp": "3.8.*",
         "cakephp/migrations": "^1.0",
         "cakephp/plugin-installer": "^1.0",
         "doctrine/dbal": "^2.9",

diff --git a/app/composer.lock b/app/composer.lock
diff --git a/app/src/Controller/AppController.php b/app/src/Controller/AppController.php
@@ -131,7 +131,7 @@ public function beforeRender(\Cake\Event\Event $event) {
     $this->set('vv_matchgrids', $this->Matchgrids->find('list')->find('activeMatchGrids')->order(['table_name' => 'ASC'])->toArray());
 
     // The set of menu permissions, so the layout knows what to render
-    if($this->Authorization && $curUser) {
+    if(isset($this->Authorization) && $curUser) {
       // Ordinarily $this->Authorization will be set, but under certain error conditions
       // it won't, which will prevent error messages from rendering
 

diff --git a/app/vendor/cakephp/cakephp/.mailmap b/app/vendor/cakephp/cakephp/.mailmap
diff --git a/app/vendor/cakephp/cakephp/.varci.yml b/app/vendor/cakephp/cakephp/.varci.yml
diff --git a/app/vendor/cakephp/cakephp/LICENSE b/app/vendor/cakephp/cakephp/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2005-2018, Cake Software Foundation, Inc. (https://cakefoundation.org)
+Copyright (c) 2005-present, Cake Software Foundation, Inc. (https://cakefoundation.org)
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

diff --git a/app/vendor/cakephp/cakephp/README.md b/app/vendor/cakephp/cakephp/README.md
@@ -38,7 +38,7 @@ recommend using the [app skeleton](https://github.com/cakephp/app) as
 a starting point. For existing applications you can run the following:
 
 ``` bash
-$ composer require cakephp/cakephp:"~3.6"
+$ composer require cakephp/cakephp
 ```
 
 ## Running Tests