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

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']);

Spacing +1 added lines, -1 removed lines

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

src/Charcoal/Model/Service/MetadataLoader.php

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;

src/Charcoal/Model/ServiceProvider/ModelServiceProvider.php

Spacing +11 added lines, -11 removed lines

@@ -67,10 +67,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']]
             ]);
         };
 
@@ -78,7 +78,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'],
@@ -90,7 +90,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']
@@ -111,7 +111,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'];
         });
 
@@ -119,7 +119,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());
         });
@@ -128,7 +128,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'     => [[
@@ -152,7 +152,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'],
@@ -170,7 +170,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,
@@ -193,7 +193,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'],
@@ -208,7 +208,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/Source/ExpressionFieldTrait.php

Spacing +1 added lines, -1 removed lines

@@ -175,7 +175,7 @@
             if ($property instanceof StorablePropertyInterface) {
                 return $property->fieldNames();
             } else {
-                return [ $property ];
+                return [$property];
             }
         }
 

src/Charcoal/Source/AbstractExpression.php

Spacing +1 added lines, -1 removed lines

@@ -258,7 +258,7 @@
      */
     public function jsonSerialize()
     {
-        return array_udiff_assoc($this->data(), $this->defaultData(), [ $this, 'diffValues' ]);
+        return array_udiff_assoc($this->data(), $this->defaultData(), [$this, 'diffValues']);
     }
 
     /**

src/Charcoal/Source/Order.php

Spacing +1 added lines, -1 removed lines

@@ -179,7 +179,7 @@
             ));
         }
 
-        if (in_array($mode, [ self::MODE_ASC, self::MODE_DESC ])) {
+        if (in_array($mode, [self::MODE_ASC, self::MODE_DESC])) {
             $this->setDirection($mode);
         }
 

src/Charcoal/Loader/CollectionLoader.php

Spacing +4 added lines, -4 removed lines

@@ -141,7 +141,7 @@ 
     {
         foreach ($data as $key => $val) {
             $setter = $this->setter($key);
-            if (is_callable([ $this, $setter ])) {
+            if (is_callable([$this, $setter])) {
                 $this->{$setter}($val);
             } else {
                 $this->{$key} = $val;
@@ -664,7 +664,7 @@ 
      */
     protected function processCollection($results, callable $before = null, callable $after = null)
     {
-        $collection   = $this->createCollection();
+        $collection = $this->createCollection();
         foreach ($results as $objData) {
             $obj = $this->processModel($objData, $before, $after);
 
@@ -695,13 +695,13 @@ 
         $obj = $this->factory()->create($objType);
 
         if ($before !== null) {
-            call_user_func_array($before, [ &$obj ]);
+            call_user_func_array($before, [&$obj]);
         }
 
         $obj->setFlatData($objData);
 
         if ($after !== null) {
-            call_user_func_array($after, [ &$obj ]);
+            call_user_func_array($after, [&$obj]);
         }
 
         return $obj;

src/Charcoal/Source/FilterCollectionTrait.php

Spacing +1 added lines, -1 removed lines

@@ -88,7 +88,7 @@
     protected function processFilter($filter)
     {
         if (!is_string($filter) && is_callable($filter)) {
-            $expr   = $this->createFilter();
+            $expr = $this->createFilter();
             /**
              * @param  FilterInterface           $expr The new filter expression object.
              * @param  FilterCollectionInterface $this The context of the collection.