Merge pull request #261 from cakephp/new-cs-rule

Remove deprecated getMock in tests and generated code + new cs rule
cakephp · Jul 14, 2016 · 9aa0f6f · 9aa0f6f
2 parents 0afd98e + c26e93e
commit 9aa0f6f
Show file tree

Hide file tree

Showing 44 changed files with 334 additions and 168 deletions.
diff --git a/composer.json b/composer.json
@@ -22,7 +22,7 @@
         "cakephp/cakephp": ">=3.2.0"
     },
     "require-dev": {
-        "cakephp/cakephp-codesniffer": "dev-master",
+        "cakephp/cakephp-codesniffer": "^2.1",
         "phpunit/phpunit": "*"
     },
     "autoload": {

diff --git a/src/Shell/BakeShell.php b/src/Shell/BakeShell.php
@@ -79,13 +79,15 @@ public function main()
             array_shift($args);
             $args = implode($args, ' ');
             $this->out(sprintf('    <info>`bin/cake bake template %s`</info>', $args), 2);
+
             return false;
         }
 
         $connections = ConnectionManager::configured();
         if (empty($connections)) {
             $this->out('Your database configuration was not found.');
             $this->out('Add your database connection information to config/app.php.');
+
             return false;
         }
         $this->out('The following commands can be used to generate skeleton code for your application.', 2);
@@ -102,6 +104,7 @@ public function main()
         }
         $this->out('');
         $this->out('By using <info>`cake bake [name]`</info> you can invoke a specific bake task.');
+
         return false;
     }
 
@@ -158,6 +161,7 @@ protected function _findTasks($tasks, $path, $namespace, $prefix = null)
             $fullName = ($prefix ? $prefix . '.' : '') . $name;
             $tasks[$name] = $fullName;
         }
+
         return $tasks;
     }
 
@@ -179,6 +183,7 @@ protected function _findClassFiles($path, $namespace)
             $name = $item->getBasename('.php');
             $candidates[] = $namespace . '\Shell\Task\\' . $name;
         }
+
         return $candidates;
     }
 
@@ -204,6 +209,7 @@ protected function _findTaskClasses($files)
             }
             $classes[] = $className;
         }
+
         return $classes;
     }
 
@@ -229,6 +235,7 @@ public function all($name = null)
                 $this->out('- ' . $table);
             }
             $this->out('Run <info>`cake bake all [name]`</info> to generate skeleton files.');
+
             return false;
         }
 
@@ -253,6 +260,7 @@ public function all($name = null)
         });
 
         $this->out('<success>Bake All complete.</success>', 1, Shell::QUIET);
+
         return true;
     }
 

diff --git a/src/Shell/Task/BakeTask.php b/src/Shell/Task/BakeTask.php
@@ -90,6 +90,7 @@ protected function _getPrefix()
             return '';
         }
         $parts = explode('/', $prefix);
+
         return implode('/', array_map([$this, '_camelize'], $parts));
     }
 
@@ -109,6 +110,7 @@ public function getPath()
         if ($prefix) {
             $path .= $prefix . DS;
         }
+
         return str_replace('/', DS, $path);
     }
 
@@ -124,6 +126,7 @@ public function main()
             $this->plugin = $this->params['plugin'];
             if (strpos($this->plugin, '\\')) {
                 $this->abort('Invalid plugin namespace separator, please use / instead of \ for plugins.');
+
                 return;
             }
         }
@@ -154,6 +157,7 @@ public function callProcess($command)
         );
         if (!is_resource($process)) {
             $this->abort('Could not start subprocess.');
+
             return;
         }
         fclose($pipes[0]);
@@ -186,6 +190,7 @@ protected function _getName($name)
             list($plugin, $name) = pluginSplit($name);
             $this->plugin = $this->params['plugin'] = $plugin;
         }
+
         return $name;
     }
 

diff --git a/src/Shell/Task/BakeTemplateTask.php b/src/Shell/Task/BakeTemplateTask.php
@@ -89,6 +89,7 @@ public function generate($template, $vars = null)
             return $this->View->render($template);
         } catch (MissingTemplateException $e) {
             $this->_io->verbose(sprintf('No bake template found for "%s"', $template));
+
             return '';
         }
     }

diff --git a/src/Shell/Task/CellTask.php b/src/Shell/Task/CellTask.php
@@ -54,11 +54,12 @@ public function template()
      * Bake the Cell class and template file.
      *
      * @param string $name The name of the cell to make.
-     * @return void
+     * @return string
      */
     public function bake($name)
     {
         $this->bakeTemplate($name);
+
         return parent::bake($name);
     }
 

diff --git a/src/Shell/Task/ControllerTask.php b/src/Shell/Task/ControllerTask.php
@@ -46,7 +46,7 @@ class ControllerTask extends BakeTask
      * Execution method always used for tasks
      *
      * @param string|null $name The name of the controller to bake.
-     * @return void
+     * @return null|bool
      */
     public function main($name = null)
     {
@@ -58,6 +58,7 @@ public function main($name = null)
             foreach ($this->listAll() as $table) {
                 $this->out('- ' . $this->_camelize($table));
             }
+
             return true;
         }
 
@@ -149,6 +150,7 @@ public function bake($controllerName)
 
         $out = $this->bakeController($controllerName, $data);
         $this->bakeTest($controllerName);
+
         return $out;
     }
 
@@ -179,14 +181,15 @@ public function bakeController($controllerName, array $data)
         $path = $this->getPath();
         $filename = $path . $controllerName . 'Controller.php';
         $this->createFile($filename, $contents);
+
         return $contents;
     }
 
     /**
      * Assembles and writes a unit test file
      *
      * @param string $className Controller class name
-     * @return string Baked test
+     * @return void|string Baked test
      */
     public function bakeTest($className)
     {
@@ -199,6 +202,7 @@ public function bakeTest($className)
         if ($prefix) {
             $className = str_replace('/', '\\', $prefix) . '\\' . $className;
         }
+
         return $this->Test->bake('Controller', $className);
     }
 
@@ -214,6 +218,7 @@ public function getComponents()
             $components = explode(',', $this->params['components']);
             $components = array_values(array_filter(array_map('trim', $components)));
         }
+
         return $components;
     }
 
@@ -229,6 +234,7 @@ public function getHelpers()
             $helpers = explode(',', $this->params['helpers']);
             $helpers = array_values(array_filter(array_map('trim', $helpers)));
         }
+
         return $helpers;
     }
 
@@ -240,6 +246,7 @@ public function getHelpers()
     public function listAll()
     {
         $this->Model->connection = $this->connection;
+
         return $this->Model->listUnskipped();
     }
 

diff --git a/src/Shell/Task/FixtureTask.php b/src/Shell/Task/FixtureTask.php
@@ -51,6 +51,7 @@ public function getPath()
         if (isset($this->plugin)) {
             $path = $this->_pluginPath($this->plugin) . 'tests/' . $dir;
         }
+
         return str_replace('/', DS, $path);
     }
 
@@ -97,7 +98,7 @@ public function getOptionParser()
      * Handles dispatching to interactive, named, or all processes.
      *
      * @param string|null $name The name of the fixture to bake.
-     * @return void
+     * @return null|bool
      */
     public function main($name = null)
     {
@@ -109,6 +110,7 @@ public function main($name = null)
             foreach ($this->Model->listUnskipped() as $table) {
                 $this->out('- ' . $this->_camelize($table));
             }
+
             return true;
         }
 
@@ -193,6 +195,7 @@ public function bake($model, $useTable = null)
         if (!empty($this->params['records'])) {
             $records = $this->_makeRecordString($this->_getRecordsFromTable($model, $useTable));
         }
+
         return $this->generateFixtureFile($model, compact('records', 'table', 'schema', 'import'));
     }
 
@@ -230,6 +233,7 @@ public function generateFixtureFile($model, array $otherVars)
         $this->createFile($path . $filename, $content);
         $emptyFile = $path . 'empty';
         $this->_deleteEmptyFile($emptyFile);
+
         return $content;
     }
 
@@ -272,6 +276,7 @@ protected function _generateSchema(Table $table)
             }
             $content .= "        '_options' => [\n" . implode(",\n", $options) . "\n        ],\n";
         }
+
         return "[\n$content    ]";
     }
 
@@ -302,6 +307,7 @@ protected function _values($values)
                 }
             }
         }
+
         return $vals;
     }
 
@@ -373,6 +379,7 @@ protected function _generateRecords(Table $table, $recordCount = 1)
             }
             $records[] = $record;
         }
+
         return $records;
     }
 
@@ -402,6 +409,7 @@ protected function _makeRecordString($records)
             $out .= "\n        ],\n";
         }
         $out .= "    ]";
+
         return $out;
     }
 

diff --git a/src/Shell/Task/MailerTask.php b/src/Shell/Task/MailerTask.php
@@ -56,11 +56,12 @@ public function template()
      * Bake the Mailer class and html/text layout files.
      *
      * @param string $name The name of the mailer to make.
-     * @return void
+     * @return string
      */
     public function bake($name)
     {
         $this->bakeLayouts($name);
+
         return parent::bake($name);
     }