jaxon-php / jaxon-mono

jaxon-config/src/Reader/PhpReader.php

Spacing +2 added lines, -2 removed lines

@@ -35,13 +35,13 @@
     public static function read(string $sConfigFile): array
     {
         $sConfigFile = realpath($sConfigFile);
-        if(!is_readable($sConfigFile))
+        if (!is_readable($sConfigFile))
         {
             throw new FileAccess($sConfigFile);
         }
 
         $aConfigOptions = include($sConfigFile);
-        if(!is_array($aConfigOptions))
+        if (!is_array($aConfigOptions))
         {
             throw new FileContent($sConfigFile);
         }

jaxon-config/src/Reader/YamlReader.php

Spacing +3 added lines, -3 removed lines

@@ -38,19 +38,19 @@
      */
     public static function read(string $sConfigFile): array
     {
-        if(!extension_loaded('yaml'))
+        if (!extension_loaded('yaml'))
         {
             throw new YamlExtension();
         }
 
         $sConfigFile = realpath($sConfigFile);
-        if(!is_readable($sConfigFile))
+        if (!is_readable($sConfigFile))
         {
             throw new FileAccess($sConfigFile);
         }
 
         $aConfigOptions = yaml_parse_file($sConfigFile);
-        if(!is_array($aConfigOptions))
+        if (!is_array($aConfigOptions))
         {
             throw new FileContent($sConfigFile);
         }

jaxon-config/src/Reader/JsonReader.php

Spacing +2 added lines, -2 removed lines

@@ -37,14 +37,14 @@
     public static function read(string $sConfigFile): array
     {
         $sConfigFile = realpath($sConfigFile);
-        if(!is_readable($sConfigFile))
+        if (!is_readable($sConfigFile))
         {
             throw new FileAccess($sConfigFile);
         }
 
         $sFileContent = file_get_contents($sConfigFile);
         $aConfigOptions = json_decode($sFileContent, true);
-        if(!is_array($aConfigOptions))
+        if (!is_array($aConfigOptions))
         {
             throw new FileContent($sConfigFile);
         }

jaxon-config/src/ConfigSetter.php

Spacing +11 added lines, -12 removed lines

@@ -44,8 +44,7 @@ 
     public function newConfig(array $aOptions = [],
         string $sNamePrefix = '', string $sValuePrefix = ''): Config
     {
-        return count($aOptions) === 0 ? new Config() :
-            $this->setOptions(new Config(), $aOptions, $sNamePrefix, $sValuePrefix);
+        return count($aOptions) === 0 ? new Config() : $this->setOptions(new Config(), $aOptions, $sNamePrefix, $sValuePrefix);
     }
 
     /**
@@ -77,7 +76,7 @@ 
         $xValue = $xOptionValue;
         $sLastName = '';
         $aNames = Value::explodeName($sOptionName);
-        while($this->pop($sLastName, $aNames) > 0)
+        while ($this->pop($sLastName, $aNames) > 0)
         {
             $sName = implode('.', $aNames);
             // The current value is overwritten if it is not an array of options.
@@ -121,15 +120,15 @@ 
         string $sNamePrefix = '', int $nDepth = 0): array
     {
         // Check the max depth
-        if($nDepth < 0 || $nDepth > 9)
+        if ($nDepth < 0 || $nDepth > 9)
         {
             throw new DataDepth($sNamePrefix, $nDepth);
         }
 
-        foreach($aOptions as $sName => $xValue)
+        foreach ($aOptions as $sName => $xValue)
         {
             $sName = trim($sName);
-            if(!Value::containsOptions($xValue))
+            if (!Value::containsOptions($xValue))
             {
                 // Save the value of this option
                 $aValues = $this->setValue($aValues, $sNamePrefix . $sName, $xValue);
@@ -160,11 +159,11 @@ 
         // Find the config array in the input data
         $sValuePrefix = trim($sValuePrefix, ' .');
         $aKeys = Value::explodeName($sValuePrefix);
-        foreach($aKeys as $sKey)
+        foreach ($aKeys as $sKey)
         {
-            if(($sKey))
+            if (($sKey))
             {
-                if(!isset($aOptions[$sKey]) || !is_array($aOptions[$sKey]))
+                if (!isset($aOptions[$sKey]) || !is_array($aOptions[$sKey]))
                 {
                     // No change if the required key is not found.
                     return new Config($xConfig->getValues(), false);
@@ -175,7 +174,7 @@ 
         }
 
         $sNamePrefix = trim($sNamePrefix, ' .');
-        if(($sNamePrefix))
+        if (($sNamePrefix))
         {
             $sNamePrefix .= '.';
         }
@@ -204,7 +203,7 @@ 
     private function deleteEntries(array $aValues, string $sName): array
     {
         $sName = rtrim($sName, '.');
-        if(!array_key_exists($sName, $aValues))
+        if (!array_key_exists($sName, $aValues))
         {
             return $aValues;
         }
@@ -229,7 +228,7 @@ 
     {
         $aValues = $xConfig->getValues();
         $nEntryCount = count($aValues);
-        foreach($aNames as $sName)
+        foreach ($aNames as $sName)
         {
             $aValues = $this->deleteEntries($aValues, $sName);
         }

jaxon-config/src/ConfigReader.php

Spacing +2 added lines, -2 removed lines

@@ -38,13 +38,13 @@
      */
     public function read(string $sConfigFile): array
     {
-        if(!($sConfigFile = trim($sConfigFile)))
+        if (!($sConfigFile = trim($sConfigFile)))
         {
             return [];
         }
 
         $sExt = pathinfo($sConfigFile, PATHINFO_EXTENSION);
-        switch($sExt)
+        switch ($sExt)
         {
         case 'php':
             $aConfigOptions = Reader\PhpReader::read($sConfigFile);

jaxon-annotations/src/Annotation/ContainerAnnotation.php

Spacing +16 added lines, -16 removed lines

@@ -122,38 +122,38 @@ 
         $value = $this->properties['__value__'];
         $aParams = preg_split('/[\s]+/', $value, 3);
         $nParamCount = count($aParams);
-        if($nParamCount === 1)
+        if ($nParamCount === 1)
         {
             // For a property, the only parameter is the class. Otherwise, it is the attribute.
-            if(self::$xReader->annotationIsOnProperty())
+            if (self::$xReader->annotationIsOnProperty())
             {
-                if(substr($aParams[0], 0, 1) === '$')
+                if (substr($aParams[0], 0, 1) === '$')
                 {
                     throw new AnnotationException('The only property of the @di annotation must be a class name');
                 }
                 $this->sClass = $this->getFullClassName($aParams[0]);
                 return;
             }
-            if(substr($aParams[0], 0, 1) !== '$')
+            if (substr($aParams[0], 0, 1) !== '$')
             {
                 throw new AnnotationException('The only property of the @di annotation must be a var name');
             }
             $this->sAttr = substr($aParams[0], 1);
             return;
         }
-        if($nParamCount === 2)
+        if ($nParamCount === 2)
         {
             // For a property, having 2 parameters is not allowed.
-            if(self::$xReader->annotationIsOnProperty())
+            if (self::$xReader->annotationIsOnProperty())
             {
                 throw new AnnotationException('The @di annotation accepts only one property on a class attribute');
             }
 
-            if(substr($aParams[0], 0, 1) !== '$')
+            if (substr($aParams[0], 0, 1) !== '$')
             {
                 throw new AnnotationException('The only property of the @di annotation must be a var name');
             }
-            if(substr($aParams[1], 0, 1) === '$')
+            if (substr($aParams[1], 0, 1) === '$')
             {
                 throw new AnnotationException('The first property of the @di annotation must be a class name');
             }
@@ -185,26 +185,26 @@ 
      */
     private function parseProperties()
     {
-        if(!$this->checkPropertiesNames())
+        if (!$this->checkPropertiesNames())
         {
             throw new AnnotationException('The @di annotation accepts only "attr" or "class" as properties');
         }
 
-        if(isset($this->properties['attr']))
+        if (isset($this->properties['attr']))
         {
-            if(self::$xReader->annotationIsOnProperty())
+            if (self::$xReader->annotationIsOnProperty())
             {
                 throw new AnnotationException('The @di annotation does not allow the "attr" property on class attributes');
             }
-            if(!is_string($this->properties['attr']))
+            if (!is_string($this->properties['attr']))
             {
                 throw new AnnotationException('The @di annotation requires a property "attr" of type string');
             }
             $this->sAttr = $this->properties['attr'];
         }
-        if(isset($this->properties['class']))
+        if (isset($this->properties['class']))
         {
-            if(!is_string($this->properties['class']))
+            if (!is_string($this->properties['class']))
             {
                 throw new AnnotationException('The @di annotation requires a property "class" of type string');
             }
@@ -221,9 +221,9 @@ 
 
         // The type in the @di annotations can be set from the values in the @var annotations
         $aPropTypes = self::$xReader->getPropTypes();
-        if($this->sClass === '')
+        if ($this->sClass === '')
         {
-            if(!isset($aPropTypes[$this->sAttr]))
+            if (!isset($aPropTypes[$this->sAttr]))
             {
                 throw new AnnotationException('No class defined for @di on attribute "' .
                     $this->sAttr . '".');

jaxon-annotations/src/Annotation/CallbackAnnotation.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
      */
     public function initAnnotation(array $properties)
     {
-        if(count($properties) !== 1 || !isset($properties['name']) || !is_string($properties['name']))
+        if (count($properties) !== 1 || !isset($properties['name']) || !is_string($properties['name']))
         {
             throw new AnnotationException('the @callback annotation requires a single string as property');
         }

jaxon-annotations/src/Annotation/ExcludeAnnotation.php

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
      */
     public function initAnnotation(array $properties)
     {
-        if(count($properties) !== 0 && (count($properties) !== 1
+        if (count($properties) !== 0 && (count($properties) !== 1
             || !isset($properties[0]) || !is_bool($properties[0])))
         {
             throw new AnnotationException('the @exclude annotation requires a single boolean or no property');

jaxon-annotations/src/Annotation/UploadAnnotation.php

Spacing +2 added lines, -3 removed lines

@@ -41,8 +41,7 @@ 
     public static function parseAnnotation($value)
     {
         $aParams = preg_split('/[\s]+/', $value, 2);
-        return count($aParams) === 1 ? ['field' => $aParams[0]] :
-            ['field' => $aParams[0], 'extra' => $aParams[1]];
+        return count($aParams) === 1 ? ['field' => $aParams[0]] : ['field' => $aParams[0], 'extra' => $aParams[1]];
     }
 
     /**
@@ -51,7 +50,7 @@ 
      */
     public function initAnnotation(array $properties)
     {
-        if(count($properties) != 1 || !isset($properties['field']) ||
+        if (count($properties) != 1 || !isset($properties['field']) ||
             !is_string($properties['field']))
         {
             throw new AnnotationException('The @upload annotation requires a property "field" of type string');