mscherer 5 years ago
parent
commit
ac50a602e5

+ 4 - 4
src/Command/CompletionCommand.php

@@ -79,11 +79,11 @@ class CompletionCommand extends Command implements CommandCollectionAwareInterfa
             'help' => 'The sub-command related to command to get information on.',
             'required' => false,
         ])->setEpilog([
-            "The various modes allow you to get help information on commands and their arguments.",
-            "The available modes are:",
-            "",
+            'The various modes allow you to get help information on commands and their arguments.',
+            'The available modes are:',
+            '',
             $modeHelp,
-            "",
+            '',
             'This command is not intended to be called manually, and should be invoked from a ' .
                 'terminal completion script.',
         ]);

+ 4 - 2
templates/Error/missing_controller.php

@@ -34,10 +34,12 @@ if (!empty($prefix)) {
 if (!empty($plugin)) {
     $namespace = str_replace('/', '\\', $plugin);
 }
+
+$filePath = 'Controller' . DIRECTORY_SEPARATOR . $prefixPath . h($class) . 'Controller.php';
 if (empty($plugin)) {
-    $path = APP_DIR . DIRECTORY_SEPARATOR . 'Controller' . DIRECTORY_SEPARATOR . $prefixPath . h($class) . 'Controller.php';
+    $path = APP_DIR . DIRECTORY_SEPARATOR . $filePath;
 } else {
-    $path = Plugin::classPath($plugin) . 'Controller' . DIRECTORY_SEPARATOR . $prefixPath . h($class) . 'Controller.php';
+    $path = Plugin::classPath($plugin) . $filePath;
 }
 
 $this->layout = 'dev_error';

+ 0 - 1
templates/element/exception_stack_trace.php

@@ -13,7 +13,6 @@
  * @link          https://cakephp.org CakePHP(tm) Project
  * @since         1.3.0
  * @license       https://opensource.org/licenses/mit-license.php MIT License
- *
  * @var array $trace
  */
 use Cake\Error\Debugger;

+ 0 - 1
templates/element/exception_stack_trace_nav.php

@@ -11,7 +11,6 @@
  * @link          https://cakephp.org CakePHP(tm) Project
  * @since         3.0.0
  * @license       https://opensource.org/licenses/mit-license.php MIT License
- *
  * @var array $trace
  */
 use Cake\Error\Debugger;