jaxon-php / jaxon-annotations

src/AnnotationReader.php

Braces +2 added lines, -4 removed lines

@@ -136,15 +136,13 @@
                 if(isset($aMethodAttrs['protected']))
                 {
                     $aProtected[] = $sMethod; // The method is not to be exported.
-                }
-                elseif(count($aMethodAttrs) > 0)
+                } elseif(count($aMethodAttrs) > 0)
                 {
                     $aAttributes[$sMethod] = $aMethodAttrs;
                 }
             }
             return [false, $aAttributes, $aProtected];
-        }
-        catch(AnnotationException $e)
+        } catch(AnnotationException $e)
         {
             throw new SetupException($e->getMessage());
         }

Spacing +12 added lines, -12 removed lines

@@ -105,13 +105,13 @@ 
         });
 
         $aAttributes = [];
-        foreach($aAnnotations as $xAnnotation)
+        foreach ($aAnnotations as $xAnnotation)
         {
             $xAnnotation->setReader($this);
             $sName = $xAnnotation->getName();
             $xAnnotation->setPrevValue($aAttributes[$sName] ?? null);
             $xValue = $xAnnotation->getValue();
-            if($sName === 'protected' && !$xValue)
+            if ($sName === 'protected' && !$xValue)
             {
                 // Ignore annotation @exclude with value false
                 continue;
@@ -158,7 +158,7 @@ 
         // Only keep the annotations declared in this package.
         $aAnnotations = array_filter($aAnnotations, function($xAnnotation) use($sProperty) {
             // Save the property type
-            if(is_a($xAnnotation, VarAnnotation::class))
+            if (is_a($xAnnotation, VarAnnotation::class))
             {
                 $this->aPropTypes[$sProperty] = $xAnnotation->type;
             }
@@ -167,7 +167,7 @@ 
         });
 
         $aAttributes = [];
-        foreach($aAnnotations as $xAnnotation)
+        foreach ($aAnnotations as $xAnnotation)
         {
             $xAnnotation->setReader($this);
             $xAnnotation->setAttr($sProperty);
@@ -198,10 +198,10 @@ 
             $this->aPropTypes = [];
             $aPropAttrs = [];
             // Properties annotations
-            foreach($aProperties as $sProperty)
+            foreach ($aProperties as $sProperty)
             {
                 $aPropertyAttrs = $this->getPropertyAttrs($sClass, $sProperty);
-                foreach($aPropertyAttrs as $sName => $xValue)
+                foreach ($aPropertyAttrs as $sName => $xValue)
                 {
                     $aPropAttrs[$sName] = array_merge($aPropAttrs[$sName] ?? [], $xValue);
                 }
@@ -211,13 +211,13 @@ 
             $this->sCurrMemberType = AnnotationManager::MEMBER_CLASS;
 
             $aClassAttrs = $this->getClassAttrs($sClass);
-            if(isset($aClassAttrs['protected']))
+            if (isset($aClassAttrs['protected']))
             {
                 return [true, [], []]; // The entire class is not to be exported.
             }
 
             // Merge attributes and class annotations
-            foreach($aPropAttrs as $sName => $xValue)
+            foreach ($aPropAttrs as $sName => $xValue)
             {
                 $aClassAttrs[$sName] = array_merge($aClassAttrs[$sName] ?? [], $xValue);
             }
@@ -227,21 +227,21 @@ 
 
             $aAttributes = count($aClassAttrs) > 0 ? ['*' => $aClassAttrs] : [];
             $aProtected = [];
-            foreach($aMethods as $sMethod)
+            foreach ($aMethods as $sMethod)
             {
                 $aMethodAttrs = $this->getMethodAttrs($sClass, $sMethod);
-                if(isset($aMethodAttrs['protected']))
+                if (isset($aMethodAttrs['protected']))
                 {
                     $aProtected[] = $sMethod; // The method is not to be exported.
                 }
-                elseif(count($aMethodAttrs) > 0)
+                elseif (count($aMethodAttrs) > 0)
                 {
                     $aAttributes[$sMethod] = $aMethodAttrs;
                 }
             }
             return [false, $aAttributes, $aProtected];
         }
-        catch(AnnotationException $e)
+        catch (AnnotationException $e)
         {
             throw new SetupException($e->getMessage());
         }

src/Annotation/DataBagAnnotation.php

Spacing +3 added lines, -3 removed lines

@@ -61,11 +61,11 @@ 
      */
     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 @databag annotation requires a property "name" of type string');
         }
-        if(!$this->validateDataBagName($properties['name']))
+        if (!$this->validateDataBagName($properties['name']))
         {
             throw new AnnotationException($properties['name'] . ' is not a valid "name" value for the @databag annotation');
         }
@@ -85,7 +85,7 @@ 
      */
     public function getValue()
     {
-        if(is_array($this->xPrevValue))
+        if (is_array($this->xPrevValue))
         {
             $this->xPrevValue[] = $this->sName; // Append the current value to the array
             return $this->xPrevValue;

src/Annotation/ExcludeAnnotation.php

Spacing +3 added lines, -3 removed lines

@@ -38,11 +38,11 @@ 
      */
     public static function parseAnnotation($value)
     {
-        if($value === 'true')
+        if ($value === 'true')
         {
             return [true];
         }
-        if($value === 'false')
+        if ($value === 'false')
         {
             return [false];
         }
@@ -55,7 +55,7 @@ 
      */
     public function initAnnotation(array $properties)
     {
-        if(count($properties) !== 0 &&
+        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');

src/Annotation/UploadAnnotation.php

Spacing +3 added lines, -3 removed lines

@@ -60,11 +60,11 @@ 
      */
     public function initAnnotation(array $properties)
     {
-        if(count($properties) != 1 || !isset($properties['field']) || !is_string($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');
         }
-        if(!$this->validateUploadField($properties['field']))
+        if (!$this->validateUploadField($properties['field']))
         {
             throw new AnnotationException($properties['field'] . ' is not a valid "field" value for the @upload annotation');
         }
@@ -84,6 +84,6 @@ 
      */
     public function getValue()
     {
-        return "'" . $this->sField . "'" ; // The field id is surrounded with simple quotes.
+        return "'" . $this->sField . "'"; // The field id is surrounded with simple quotes.
     }
 }

src/start.php

Spacing +4 added lines, -4 removed lines

@@ -22,13 +22,13 @@ 
  */
 function register(Container $di, bool $bForce = false)
 {
-    if(!$bForce && $di->h(AnnotationReader::class))
+    if (!$bForce && $di->h(AnnotationReader::class))
     {
         return;
     }
 
     $sCacheDirKey = 'jaxon_annotations_cache_dir';
-    if(!$di->h($sCacheDirKey))
+    if (!$di->h($sCacheDirKey))
     {
         $di->val($sCacheDirKey, sys_get_temp_dir());
     }
@@ -49,7 +49,7 @@ 
 {
     $di = jaxon()->di();
     $sEventListenerKey = AnnotationReader::class . '\\ConfigListener';
-    if($di->h($sEventListenerKey))
+    if ($di->h($sEventListenerKey))
     {
         return;
     }
@@ -62,7 +62,7 @@ 
             public function onChange(Config $xConfig, string $sName)
             {
                 $sConfigKey = 'core.annotations.enabled';
-                if(($sName === $sConfigKey || $sName === '') && $xConfig->getOption($sConfigKey))
+                if (($sName === $sConfigKey || $sName === '') && $xConfig->getOption($sConfigKey))
                 {
                     register(jaxon()->di());
                 }

src/Annotation/ContainerAnnotation.php

Switch Indentation +8 added lines, -8 removed lines

@@ -197,14 +197,14 @@
         $nCount = count($this->properties);
         switch($nCount)
         {
-        case 0:
-            return true;
-        case 1:
-            return isset($this->properties['attr']) || isset($this->properties['class']);
-        case 2:
-            return isset($this->properties['attr']) && isset($this->properties['class']);
-        default:
-            return false;
+            case 0:
+                return true;
+            case 1:
+                return isset($this->properties['attr']) || isset($this->properties['class']);
+            case 2:
+                return isset($this->properties['attr']) && isset($this->properties['class']);
+            default:
+                return false;
         }
     }
 

Spacing +21 added lines, -21 removed lines

@@ -134,7 +134,7 @@ 
      */
     private function getFullClassName(string $sClassName): string
     {
-        return ltrim($this->xClassFile->resolveType($sClassName), '\\');;
+        return ltrim($this->xClassFile->resolveType($sClassName), '\\'); ;
     }
 
     /**
@@ -146,38 +146,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($this->xReader->annotationIsOnProperty())
+            if ($this->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($this->xReader->annotationIsOnProperty())
+            if ($this->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');
             }
@@ -195,7 +195,7 @@ 
     private function checkPropertiesNames(): bool
     {
         $nCount = count($this->properties);
-        switch($nCount)
+        switch ($nCount)
         {
         case 0:
             return true;
@@ -214,26 +214,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($this->xReader->annotationIsOnProperty())
+            if ($this->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');
             }
@@ -251,25 +251,25 @@ 
 
         // The type in the @di annotations can be set from the values in the @var annotations
         $aPropTypes = $this->xReader->getPropTypes();
-        if($this->sClass === '' && isset($aPropTypes[$this->sAttr]))
+        if ($this->sClass === '' && isset($aPropTypes[$this->sAttr]))
         {
             $this->sClass = ltrim($aPropTypes[$this->sAttr], '\\');
         }
 
-        if($this->xReader->annotationIsOnProperty() && $this->xPrevValue !== null)
+        if ($this->xReader->annotationIsOnProperty() && $this->xPrevValue !== null)
         {
             throw new AnnotationException('Only one @di annotation is allowed on a property');
         }
-        if(!$this->validateAttrName($this->sAttr))
+        if (!$this->validateAttrName($this->sAttr))
         {
             throw new AnnotationException($this->sAttr . ' is not a valid "attr" value for the @di annotation');
         }
-        if(!$this->validateClassName($this->sClass))
+        if (!$this->validateClassName($this->sClass))
         {
             throw new AnnotationException($this->sClass . ' is not a valid "class" value for the @di annotation');
         }
 
-        if(is_array($this->xPrevValue))
+        if (is_array($this->xPrevValue))
         {
             $this->xPrevValue[$this->sAttr] = $this->sClass; // Append the current value to the array
             return $this->xPrevValue;

src/Annotation/HookAnnotation.php

Spacing +8 added lines, -8 removed lines

@@ -57,7 +57,7 @@ 
     public static function parseAnnotation($value)
     {
         $aParams = preg_split('/[\s]+/', $value, 2);
-        if(count($aParams) === 1)
+        if (count($aParams) === 1)
         {
             return ['call' => rtrim($aParams[0])];
         }
@@ -81,28 +81,28 @@ 
      */
     public function initAnnotation(array $properties)
     {
-        if(!isset($properties['call']) || !is_string($properties['call']))
+        if (!isset($properties['call']) || !is_string($properties['call']))
         {
             throw new AnnotationException('The @' . $this->getType() .
                 ' annotation requires a property "call" of type string');
         }
-        if(!$this->validateMethodName($properties['call']))
+        if (!$this->validateMethodName($properties['call']))
         {
             throw new AnnotationException($properties['call'] .
                 ' is not a valid "call" value for the @' . $this->getType() . ' annotation');
         }
-        foreach(array_keys($properties) as $propName)
+        foreach (array_keys($properties) as $propName)
         {
-            if($propName !== 'call' && $propName !== 'with')
+            if ($propName !== 'call' && $propName !== 'with')
             {
                 throw new AnnotationException('Unknown property "' . $propName .
                     '" in the @' . $this->getType() . ' annotation');
             }
         }
         // Cannot use isset here, because it will return false in case $properties['with'] === null
-        if(array_key_exists('with', $properties))
+        if (array_key_exists('with', $properties))
         {
-            if(!is_array($properties['with']))
+            if (!is_array($properties['with']))
             {
                 throw new AnnotationException('The "with" property of the @' .
                     $this->getType() . ' annotation must be of type array');
@@ -117,7 +117,7 @@ 
      */
     public function getValue()
     {
-        if(is_array($this->xPrevValue))
+        if (is_array($this->xPrevValue))
         {
             // Add the current value to the array
             $this->xPrevValue[$this->sMethodName] = $this->sMethodParams;

src/Annotation/CallbackAnnotation.php

Spacing +2 added lines, -2 removed lines

@@ -62,11 +62,11 @@
      */
     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');
         }
-        if(!$this->validateObjectName($properties['name']))
+        if (!$this->validateObjectName($properties['name']))
         {
             throw new AnnotationException($properties['name'] . ' is not a valid "name" value for the @callback annotation');
         }