locomotivemtl / charcoal-core

src/Charcoal/Model/ModelValidator.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 
         $ret = true;
         foreach ($props as $ident => $p) {
-            if (!$p ||  !$p->active()) {
+            if (!$p || !$p->active()) {
                 continue;
             }
             $valid = $p->validate();

src/Charcoal/Model/AbstractModel.php

Spacing +1 added lines, -1 removed lines

@@ -171,7 +171,7 @@
     public function propertyValue($propertyIdent)
     {
         $getter = $this->getter($propertyIdent);
-        $func   = [ $this, $getter ];
+        $func   = [$this, $getter];
 
         if (is_callable($func)) {
             return call_user_func($func);

Indentation +1 added lines, -1 removed lines

@@ -92,7 +92,7 @@
 
         // Optional StorableInterface dependencies
         if (isset($data['source'])) {
-             $this->setSource($data['source']);
+                $this->setSource($data['source']);
         }
         if (isset($data['source_factory'])) {
             $this->setSourceFactory($data['source_factory']);

Doc Comments +3 added lines, -3 removed lines

@@ -195,7 +195,7 @@ 
      * Also add a special case, to merge values for l10n properties.
      *
      * @param array|\Traversable $data The data to merge.
-     * @return EntityInterface Chainable
+     * @return AbstractModel Chainable
      * @see \Charcoal\Config\AbstractEntity::offsetSet()
      */
     public function mergeData($data)
@@ -522,7 +522,7 @@ 
      * ValidatableInterface > create_validator().
      *
      * @param array $data Optional.
-     * @return ValidatorInterface
+     * @return ModelValidator
      */
     protected function createValidator(array $data = null)
     {
@@ -535,7 +535,7 @@ 
 
     /**
      * @param array $data Optional. View data.
-     * @return ViewInterface
+     * @return GenericView
      */
     public function createView(array $data = null)
     {

src/Charcoal/Source/AbstractSource.php

Spacing +1 added lines, -1 removed lines

@@ -186,7 +186,7 @@
                 'Property must be a string.'
             );
         }
-        if ($property=='') {
+        if ($property == '') {
             throw new InvalidArgumentException(
                 'Property can not be empty.'
             );

Unused Use Statements -1 removed lines

@@ -15,7 +15,6 @@
 
 // From 'charcoal-core'
 use Charcoal\Model\ModelInterface;
-
 use Charcoal\Source\SourceConfig;
 use Charcoal\Source\SourceInterface;
 use Charcoal\Source\Filter;

Doc Comments +4 added lines, -4 removed lines

@@ -153,7 +153,7 @@ 
      * If no properties are set, it is assumed that all the Model's properties are to be fetched.
      *
      * @param array $properties The properties.
-     * @return ColelectionLoader Chainable
+     * @return AbstractSource Chainable
      */
     public function setProperties(array $properties)
     {
@@ -283,7 +283,7 @@ 
 
     /**
      * @param array $orders The orders to set.
-     * @return CollectionLoader Chainable
+     * @return AbstractSource Chainable
      */
     public function setOrders(array $orders)
     {
@@ -404,7 +404,7 @@ 
     /**
      * @param integer $page The page number.
      * @throws InvalidArgumentException If the page argument is not numeric.
-     * @return CollectionLoader Chainable
+     * @return AbstractSource Chainable
      */
     public function setPage($page)
     {
@@ -428,7 +428,7 @@ 
     /**
      * @param integer $num The number of items to retrieve per page.
      * @throws InvalidArgumentException If the num per page argument is not numeric.
-     * @return CollectionLoader Chainable
+     * @return AbstractSource Chainable
      */
     public function setNumPerPage($num)
     {

src/Charcoal/Source/Pagination.php

Spacing +1 added lines, -1 removed lines

@@ -115,6 +115,6 @@
     {
         $first = $this->first();
         $numPerPage = $this->numPerPage();
-        return ($first + $numPerPage);
+        return ($first+$numPerPage);
     }
 }

src/Charcoal/Source/Filter.php

Spacing +1 added lines, -1 removed lines

@@ -316,7 +316,7 @@
             '>', '>=', '<', '<=',
             'IS NULL', 'IS NOT NULL',
             '%', 'MOD',
-            'IN','NOT IN',
+            'IN', 'NOT IN',
             'REGEXP', 'NOT REGEXP'
         ];
 

src/Charcoal/Source/DatabaseSourceConfig.php

Doc Comments +1 added lines, -1 removed lines

@@ -178,7 +178,7 @@
     }
 
     /**
-     * @return bools
+     * @return boolean
      */
     public function disableUtf8()
     {

src/Charcoal/Model/ServiceProvider/ModelServiceProvider.php

Spacing +11 added lines, -11 removed lines

@@ -56,10 +56,10 @@ 
          * @param Container $container A Pimple DI container instance.
          * @return ModelFactory
          */
-        $container['model/factory'] = function (Container $container) {
+        $container['model/factory'] = function(Container $container) {
             return new Factory([
                 'base_class' => ModelInterface::class,
-                'arguments'  => [ $container['model/dependencies'] ]
+                'arguments'  => [$container['model/dependencies']]
             ]);
         };
 
@@ -67,7 +67,7 @@ 
          * @param Container $container A Pimple DI container instance.
          * @return ModelBuilder
          */
-        $container['model/builder'] = function (Container $container) {
+        $container['model/builder'] = function(Container $container) {
             return new ModelBuilder([
                 'factory'           => $container['model/factory'],
                 'metadata_loader'   => $container['metadata/loader'],
@@ -79,7 +79,7 @@ 
          * @param Container $container A Pimple DI container instance.
          * @return ModelLoaderBuilder
          */
-        $container['model/loader/builder'] = function (Container $container) {
+        $container['model/loader/builder'] = function(Container $container) {
             return new ModelLoaderBuilder([
                 'factory' => $container['model/factory'],
                 'cache'     => $container['cache']
@@ -90,7 +90,7 @@ 
          * @param Container $container A Pimple DI container instance.
          * @return CollectionLoader
          */
-        $container['model/collection/loader'] = $container->factory(function (Container $container) {
+        $container['model/collection/loader'] = $container->factory(function(Container $container) {
             $factory = $container['model/collection/loader/factory'];
             return $factory->create($factory->defaultClass());
         });
@@ -99,7 +99,7 @@ 
          * @param Container $container A Pimple DI container instance.
          * @return FactoryInterface
          */
-        $container['model/collection/loader/factory'] = function (Container $container) {
+        $container['model/collection/loader/factory'] = function(Container $container) {
             return new Factory([
                 'default_class' => CollectionLoader::class,
                 'arguments'     => [[
@@ -114,7 +114,7 @@ 
          * @param Container $container A Pimple DI container instance.
          * @return ArrayAccess|\Traversable
          */
-        $container['model/collection'] = $container->factory(function (Container $container) {
+        $container['model/collection'] = $container->factory(function(Container $container) {
             return new $container['model/collection/class'];
         });
 
@@ -134,7 +134,7 @@ 
              * @param Container $container A Pimple DI container instance.
              * @return array The model dependencies array.
              */
-            $container['model/dependencies'] = function (Container $container) {
+            $container['model/dependencies'] = function(Container $container) {
                 return [
                     'container'        => $container,
                     'logger'           => $container['logger'],
@@ -152,7 +152,7 @@ 
              * @param Container $container A Pimple DI container instance.
              * @return \Charcoal\Factory\FactoryInterface
              */
-            $container['property/factory'] = function (Container $container) {
+            $container['property/factory'] = function(Container $container) {
                 return new Factory([
                     'base_class'       => PropertyInterface::class,
                     'default_class'    => GenericProperty::class,
@@ -173,7 +173,7 @@ 
              * @param Container $container A Pimple DI container instance.
              * @return MetadataLoader
              */
-            $container['metadata/loader'] = function (Container $container) {
+            $container['metadata/loader'] = function(Container $container) {
                 return new MetadataLoader([
                     'logger'    => $container['logger'],
                     'cache'     => $container['cache'],
@@ -188,7 +188,7 @@ 
              * @param Container $container A Pimple DI container instance.
              * @return \Charcoal\Factory\FactoryInterface
              */
-            $container['source/factory'] = function (Container $container) {
+            $container['source/factory'] = function(Container $container) {
                 return new Factory([
                     'map' => [
                         'database' => DatabaseSource::class

src/Charcoal/Model/Collection.php

Doc Comments +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
     /**
      * Create a new collection.
      *
-     * @param  array|Traversable|null $objs Array of objects to pre-populate this collection.
+     * @param  Collection $objs Array of objects to pre-populate this collection.
      * @return void
      */
     public function __construct($objs = null)
@@ -214,7 +214,7 @@ 
     /**
      * Retrieve the primary keys of the objects in the collection.
      *
-     * @return array A sequential array of keys.
+     * @return integer[] A sequential array of keys.
      */
     public function keys()
     {

Spacing +2 added lines, -2 removed lines

@@ -316,7 +316,7 @@ 
     {
         if (is_int($offset)) {
             if ($offset < 0) {
-                $offset = ($this->count() - abs($offset));
+                $offset = ($this->count()-abs($offset));
             }
         }
 
@@ -448,7 +448,7 @@ 
         } elseif ($value instanceof Traversable) {
             return iterator_to_array($value);
         } elseif ($value instanceof ModelInterface) {
-            return [ $value ];
+            return [$value];
         }
 
         return (array)$value;

src/Charcoal/Model/Service/MetadataLoader.php

Doc Comments +2 added lines, -2 removed lines

@@ -241,7 +241,7 @@ 
      * Validate a resolved path.
      *
      * @param  string $path The path to validate.
-     * @return string
+     * @return boolean
      */
     private function validatePath($path)
     {
@@ -455,7 +455,7 @@ 
     /**
      * Load the contents of a JSON file.
      *
-     * @param  mixed $filename The file path to retrieve.
+     * @param  string $filename The file path to retrieve.
      * @throws InvalidArgumentException If a JSON decoding error occurs.
      * @return array|null
      */

Spacing +2 added lines, -2 removed lines

@@ -383,7 +383,7 @@ 
         $classname = $this->identToClassname($ident);
 
         if (!class_exists($classname) && !interface_exists($classname)) {
-            return [ $ident ];
+            return [$ident];
         }
 
         $classes   = array_values(class_parents($classname));
@@ -510,7 +510,7 @@ 
      */
     private function filenameFromIdent($ident)
     {
-        $filename  = str_replace([ '\\' ], '.', $ident);
+        $filename  = str_replace(['\\'], '.', $ident);
         $filename .= '.json';
 
         return $filename;