Skip to content

Commit

Permalink
Removing default null property assignments. Class property default va…
Browse files Browse the repository at this point in the history
…lue is NULL if not specified; assigning it explicitly is redundant.
  • Loading branch information
Theaxiom committed Apr 17, 2017
1 parent 534fb76 commit eeb969d
Show file tree
Hide file tree
Showing 61 changed files with 111 additions and 111 deletions.
2 changes: 1 addition & 1 deletion src/Auth/ControllerAuthorize.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class ControllerAuthorize extends BaseAuthorize
*
* @var \Cake\Controller\Controller
*/
protected $_Controller = null;
protected $_Controller;

/**
* {@inheritDoc}
Expand Down
2 changes: 1 addition & 1 deletion src/Cache/CacheEngine.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ abstract class CacheEngine
*
* @var string
*/
protected $_groupPrefix = null;
protected $_groupPrefix;

/**
* Initialize the cache engine
Expand Down
2 changes: 1 addition & 1 deletion src/Cache/Engine/FileEngine.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class FileEngine extends CacheEngine
*
* @var \SplFileObject|null
*/
protected $_File = null;
protected $_File;

/**
* The default config used unless overridden by runtime configuration
Expand Down
2 changes: 1 addition & 1 deletion src/Cache/Engine/MemcachedEngine.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class MemcachedEngine extends CacheEngine
*
* @var \Memcached
*/
protected $_Memcached = null;
protected $_Memcached;

/**
* The default config used unless overridden by runtime configuration
Expand Down
2 changes: 1 addition & 1 deletion src/Cache/Engine/RedisEngine.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class RedisEngine extends CacheEngine
*
* @var \Redis
*/
protected $_Redis = null;
protected $_Redis;

/**
* The default config used unless overridden by runtime configuration
Expand Down
4 changes: 2 additions & 2 deletions src/Console/ConsoleOptionParser.php
Original file line number Diff line number Diff line change
Expand Up @@ -79,15 +79,15 @@ class ConsoleOptionParser
* @see \Cake\Console\ConsoleOptionParser::description()
* @var string
*/
protected $_description = null;
protected $_description;

/**
* Epilog text - displays after options when help is generated
*
* @see \Cake\Console\ConsoleOptionParser::epilog()
* @var string
*/
protected $_epilog = null;
protected $_epilog;

/**
* Option definitions.
Expand Down
4 changes: 2 additions & 2 deletions src/Console/Shell.php
Original file line number Diff line number Diff line change
Expand Up @@ -116,15 +116,15 @@ class Shell
*
* @var string
*/
public $name = null;
public $name;

/**
* The name of the plugin the shell belongs to.
* Is automatically set by ShellDispatcher when a shell is constructed.
*
* @var string
*/
public $plugin = null;
public $plugin;

/**
* Contains tasks to load and instantiate
Expand Down
2 changes: 1 addition & 1 deletion src/Controller/Component/CookieComponent.php
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ class CookieComponent extends Component
* @var \Cake\Http\Response|null
* @deprecated 3.4.0 Will be removed in 4.0.0
*/
protected $_response = null;
protected $_response;

/**
* Initialize config data and properties.
Expand Down
4 changes: 2 additions & 2 deletions src/Controller/Component/RequestHandlerComponent.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,14 @@ class RequestHandlerComponent extends Component
* @var string|null
* @see \Cake\Routing\Router::extensions()
*/
public $ext = null;
public $ext;

/**
* The template to use when rendering the given content type.
*
* @var string|null
*/
protected $_renderType = null;
protected $_renderType;

/**
* Default config
Expand Down
2 changes: 1 addition & 1 deletion src/Controller/Component/SecurityComponent.php
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ class SecurityComponent extends Component
*
* @var string
*/
protected $_action = null;
protected $_action;

/**
* The Session object
Expand Down
2 changes: 1 addition & 1 deletion src/Controller/ComponentRegistry.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class ComponentRegistry extends ObjectRegistry implements EventDispatcherInterfa
*
* @var \Cake\Controller\Controller
*/
protected $_Controller = null;
protected $_Controller;

/**
* Constructor.
Expand Down
6 changes: 3 additions & 3 deletions src/Controller/Controller.php
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ class Controller implements EventListenerInterface, EventDispatcherInterface
*
* @var string
*/
public $name = null;
public $name;

/**
* An array containing the names of helpers this controller uses. The array elements should
Expand Down Expand Up @@ -166,7 +166,7 @@ class Controller implements EventListenerInterface, EventDispatcherInterface
*
* @var \Cake\Controller\ComponentRegistry
*/
protected $_components = null;
protected $_components;

/**
* Array containing the names of components this controller uses. Component names
Expand Down Expand Up @@ -206,7 +206,7 @@ class Controller implements EventListenerInterface, EventDispatcherInterface
*
* @var string
*/
public $plugin = null;
public $plugin;

/**
* Holds all passed params.
Expand Down
2 changes: 1 addition & 1 deletion src/Controller/Exception/SecurityException.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class SecurityException extends BadRequestException
*
* @var string
*/
protected $_reason = null;
protected $_reason;

/**
* Getter for type
Expand Down
2 changes: 1 addition & 1 deletion src/Core/Configure.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class Configure
*
* @var bool|null
*/
protected static $_hasIniSet = null;
protected static $_hasIniSet;

/**
* Used to store a dynamic variable in Configure.
Expand Down
2 changes: 1 addition & 1 deletion src/Core/Exception/Exception.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class Exception extends RuntimeException
*
* @var array|null
*/
protected $_responseHeaders = null;
protected $_responseHeaders;

/**
* Constructor.
Expand Down
6 changes: 3 additions & 3 deletions src/Database/Connection.php
Original file line number Diff line number Diff line change
Expand Up @@ -83,22 +83,22 @@ class Connection implements ConnectionInterface
*
* @var \Cake\Database\Log\QueryLogger|null
*/
protected $_logger = null;
protected $_logger;

/**
* The schema collection object
*
* @var \Cake\Database\Schema\Collection|null
*/
protected $_schemaCollection = null;
protected $_schemaCollection;

/**
* NestedTransactionRollbackException object instance, will be stored if
* the rollback method is called in some nested transaction.
*
* @var \Cake\Database\Exception\NestedTransactionRollbackException|null
*/
protected $nestedTransactionRollbackException = null;
protected $nestedTransactionRollbackException;

/**
* Constructor.
Expand Down
2 changes: 1 addition & 1 deletion src/Database/Driver/PDODriverTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ trait PDODriverTrait
*
* @var \PDO|null
*/
protected $_connection = null;
protected $_connection;

/**
* Establishes a connection to the database server
Expand Down
2 changes: 1 addition & 1 deletion src/Database/Expression/CaseExpression.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class CaseExpression implements ExpressionInterface
*
* @var string|\Cake\Database\ExpressionInterface|array|null
*/
protected $_elseValue = null;
protected $_elseValue;

/**
* Constructs the case expression
Expand Down
2 changes: 1 addition & 1 deletion src/Database/Expression/ValuesExpression.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class ValuesExpression implements ExpressionInterface
*
* @var \Cake\Database\Query|null
*/
protected $_query = null;
protected $_query;

/**
* Whether or not values have been casted to expressions
Expand Down
6 changes: 3 additions & 3 deletions src/Database/Query.php
Original file line number Diff line number Diff line change
Expand Up @@ -97,22 +97,22 @@ class Query implements ExpressionInterface, IteratorAggregate
*
* @var \Cake\Database\StatementInterface|null
*/
protected $_iterator = null;
protected $_iterator;

/**
* The object responsible for generating query placeholders and temporarily store values
* associated to each of those.
*
* @var \Cake\Database\ValueBinder|null
*/
protected $_valueBinder = null;
protected $_valueBinder;

/**
* Instance of functions builder object used for generating arbitrary SQL functions.
*
* @var \Cake\Database\FunctionsBuilder|null
*/
protected $_functionsBuilder = null;
protected $_functionsBuilder;

/**
* Boolean for tracking whether or not buffered results
Expand Down
2 changes: 1 addition & 1 deletion src/Database/Type.php
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ class Type implements TypeInterface
*
* @var string
*/
protected $_name = null;
protected $_name;

/**
* Constructor
Expand Down
2 changes: 1 addition & 1 deletion src/Database/Type/BinaryType.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class BinaryType extends Type implements TypeInterface
*
* @var string|null
*/
protected $_name = null;
protected $_name;

/**
* Constructor.
Expand Down
2 changes: 1 addition & 1 deletion src/Database/Type/BoolType.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class BoolType extends Type implements TypeInterface
*
* @var string|null
*/
protected $_name = null;
protected $_name;

/**
* Constructor.
Expand Down
2 changes: 1 addition & 1 deletion src/Database/Type/DateTimeType.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class DateTimeType extends Type implements TypeInterface
*
* @var string|null
*/
protected $_name = null;
protected $_name;

/**
* The class to use for representing date objects
Expand Down
2 changes: 1 addition & 1 deletion src/Database/Type/DecimalType.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class DecimalType extends Type implements TypeInterface
*
* @var string|null
*/
protected $_name = null;
protected $_name;

/**
* Constructor.
Expand Down
2 changes: 1 addition & 1 deletion src/Database/Type/FloatType.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class FloatType extends Type implements TypeInterface
*
* @var string|null
*/
protected $_name = null;
protected $_name;

/**
* Constructor.
Expand Down
2 changes: 1 addition & 1 deletion src/Database/Type/IntegerType.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class IntegerType extends Type implements TypeInterface
*
* @var string|null
*/
protected $_name = null;
protected $_name;

/**
* Constructor.
Expand Down
2 changes: 1 addition & 1 deletion src/Database/Type/JsonType.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class JsonType extends Type implements TypeInterface
*
* @var string|null
*/
protected $_name = null;
protected $_name;

/**
* Constructor.
Expand Down
2 changes: 1 addition & 1 deletion src/Datasource/ConnectionManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ class ConnectionManager
*
* @var \Cake\Datasource\ConnectionRegistry
*/
protected static $_registry = null;
protected static $_registry;

/**
* Configure a new connection object.
Expand Down
4 changes: 2 additions & 2 deletions src/Event/Event.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class Event
*
* @var string
*/
protected $_name = null;
protected $_name;

/**
* The object this event applies to (usually the same object that generates the event)
Expand All @@ -53,7 +53,7 @@ class Event
*
* @var mixed
*/
public $result = null;
public $result;

/**
* Flags an event as stopped or not, default is false
Expand Down
2 changes: 1 addition & 1 deletion src/Event/EventDispatcherTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ trait EventDispatcherTrait
*
* @var \Cake\Event\EventManager
*/
protected $_eventManager = null;
protected $_eventManager;

/**
* Default class name for new event objects.
Expand Down
2 changes: 1 addition & 1 deletion src/Event/EventManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class EventManager
*
* @var \Cake\Event\EventManager
*/
protected static $_generalManager = null;
protected static $_generalManager;

/**
* List of listener callbacks associated to
Expand Down
Loading

0 comments on commit eeb969d

Please sign in to comment.