jaxon-php / jaxon-annotations

src/AnnotationReader.php

Spacing +15 added lines, -15 removed lines

@@ -86,12 +86,12 @@ 
      */
     public static 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());
         }
@@ -133,13 +133,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)) // Ignore annotation @exclude with value false
+            if ($sName !== 'protected' || ($xValue)) // Ignore annotation @exclude with value false
             {
                 $aAttributes[$sName] = $xValue;
             }
@@ -159,7 +159,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;
             }
@@ -168,11 +168,11 @@ 
         });
 
         $nCount = count($aAnnotations);
-        if($nCount === 0)
+        if ($nCount === 0)
         {
             return ['', null];
         }
-        if($nCount > 1)
+        if ($nCount > 1)
         {
             throw new AnnotationException('Only one @di annotation is allowed on a property');
         }
@@ -203,10 +203,10 @@ 
             $this->aPropTypes = [];
             $aPropAttrs = [];
             // Properties annotations
-            foreach($aProperties as $sProperty)
+            foreach ($aProperties as $sProperty)
             {
                 [$sName, $xValue] = $this->propAnnotations($sProperty, $this->xManager->getPropertyAnnotations($sClass, $sProperty));
-                if($xValue !== null)
+                if ($xValue !== null)
                 {
                     $aPropAttrs[$sName] = array_merge($aPropAttrs[$sName] ?? [], $xValue);
                 }
@@ -216,13 +216,13 @@ 
             $this->sMemberType = AnnotationManager::MEMBER_CLASS;
 
             $aClassAttrs = $this->filterAnnotations($this->xManager->getClassAnnotations($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);
             }
@@ -232,21 +232,21 @@ 
 
             $aAttributes = count($aClassAttrs) > 0 ? ['*' => $aClassAttrs] : [];
             $aProtected = [];
-            foreach($aMethods as $sMethod)
+            foreach ($aMethods as $sMethod)
             {
                 $aMethodAttrs = $this->filterAnnotations($this->xManager->getMethodAnnotations($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());
         }

Braces +5 added lines, -5 removed lines

@@ -139,10 +139,12 @@ 
             $sName = $xAnnotation->getName();
             $xAnnotation->setPrevValue($aAttributes[$sName] ?? null);
             $xValue = $xAnnotation->getValue();
-            if($sName !== 'protected' || ($xValue)) // Ignore annotation @exclude with value false
+            if($sName !== 'protected' || ($xValue)) {
+                // Ignore annotation @exclude with value false
             {
                 $aAttributes[$sName] = $xValue;
             }
+            }
         }
         return $aAttributes;
     }
@@ -238,15 +240,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());
         }