Skip to content
Permalink
Browse files

Fix remaining PHPCS errors.

  • Loading branch information...
markstory committed Jul 9, 2014
1 parent 6eeb55c commit a0fec85f6445a915db0859933da7ac652abe764b
@@ -475,6 +475,7 @@ public function plugin($name, $options = [], $callback = null) {
* @param callable $callback The callback to invoke that builds the plugin routes
* Only required when $params is defined.
* @return void
* @throws \InvalidArgumentException when there is no callable parameter.
*/
public function scope($path, $params, $callback) {
if ($callback === null) {
@@ -58,6 +58,7 @@ class RouteCollection {
* @param \Cake\Routing\Route\Route $route The route object to add.
* @param array $options Addtional options for the route. Primarily for the
* `_name` option, which enables named routes.
* @return void
*/
public function add(Route $route, $options = []) {
$this->_routes[] = $route;
@@ -997,10 +997,10 @@ public static function prefix($name, $callback) {
* Routes connected in the scoped collection will have the correct path segment
* prepended, and have a matching plugin routing key set.
*
* @param string $path The path name to use for the prefix.
* @param array|callable $options Either the options to use, or a callback.
* @param string $name The plugin name to build routes for
* @param array|callable $options Either the options to use, or a callback
* @param callable $callback The callback to invoke that builds the plugin routes.
* Only required when $options is defined.
* Only required when $options is defined
* @return void
*/
public static function plugin($name, $options = [], $callback = null) {
@@ -375,7 +375,7 @@ protected function _getValidator($parts) {
* Get the table instance from a property path
*
* @param array $parts Each one of the parts in a path for a field name
* @param bool $rootFallback
* @param bool $rootFallback Whether or not to fallback to the root entity.
* @return \Cake\ORM\Table|bool Table instance or false
*/
protected function _getTable($parts, $rootFallback = true) {
@@ -14,18 +14,17 @@
*/
namespace Cake\Test\TestCase\Controller\Component;
use Cake\Event\Event;
use Cake\Controller\ComponentRegistry;
use Cake\Controller\Component\FlashComponent;
use Cake\Controller\Controller;
use Cake\Core\Configure;
use Cake\Network\Request;
use Cake\Event\Event;
use Cake\Network\Session;
use Cake\TestSuite\TestCase;
/**
* FlashComponentTest class
*
*/
class FlashComponentTest extends TestCase {
@@ -14,8 +14,8 @@
*/
namespace Cake\Test\TestCase\Network;
use Cake\Network\Socket;
use Cake\Network\Error\SocketException;
use Cake\Network\Socket;
use Cake\TestSuite\TestCase;
/**
@@ -126,7 +126,6 @@ public function testNullableTimeColumn() {
$this->assertNull($entity->created);
}
/**
* Test for https://github.com/cakephp/cakephp/issues/3626
*
@@ -16,8 +16,8 @@
use Cake\Routing\RouteBuilder;
use Cake\Routing\RouteCollection;
use Cake\Routing\Route\Route;
use Cake\Routing\Router;
use Cake\Routing\Route\Route;
use Cake\TestSuite\TestCase;
/**
@@ -14,10 +14,10 @@
*/
namespace Cake\Test\TestCase\Routing;
use Cake\Routing\Route\Route;
use Cake\Routing\Router;
use Cake\Routing\RouteBuilder;
use Cake\Routing\RouteCollection;
use Cake\Routing\Router;
use Cake\Routing\Route\Route;
use Cake\TestSuite\TestCase;
class RouteCollectionTest extends TestCase {

0 comments on commit a0fec85

Please sign in to comment.
You can’t perform that action at this time.