jaxon-php / jaxon-mono

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

Switch Indentation +48 added lines, -48 removed lines

@@ -175,62 +175,62 @@
             0 => true,
             1 => isset($this->properties['attr']) || isset($this->properties['class']),
             2 => isset($this->properties['attr']) && isset($this->properties['class']),
-            default => false,
-        };
-    }
+default => false,
+};
+}
 
-    /**
+/**
      * @return void
      * @throws AnnotationException
      */
-    private function parseProperties()
-    {
-        if(!$this->checkPropertiesNames())
-        {
-            throw new AnnotationException('The @di annotation accepts only "attr" or "class" as properties');
-        }
+private function parseProperties()
+{
+if(!$this->checkPropertiesNames())
+{
+throw new AnnotationException('The @di annotation accepts only "attr" or "class" as properties');
+}
 
-        if(isset($this->properties['attr']))
-        {
-            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']))
-            {
-                throw new AnnotationException('The @di annotation requires a property "attr" of type string');
-            }
-            $this->sAttr = $this->properties['attr'];
-        }
-        if(isset($this->properties['class']))
-        {
-            if(!is_string($this->properties['class']))
-            {
-                throw new AnnotationException('The @di annotation requires a property "class" of type string');
-            }
-            $this->sClass = $this->getFullClassName($this->properties['class']);
-        }
-    }
+if(isset($this->properties['attr']))
+{
+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']))
+{
+    throw new AnnotationException('The @di annotation requires a property "attr" of type string');
+}
+$this->sAttr = $this->properties['attr'];
+}
+if(isset($this->properties['class']))
+{
+if(!is_string($this->properties['class']))
+{
+    throw new AnnotationException('The @di annotation requires a property "class" of type string');
+}
+$this->sClass = $this->getFullClassName($this->properties['class']);
+}
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function saveValue(Metadata $xMetadata, string $sMethod = '*'): void
-    {
-        isset($this->properties['__value__']) ? $this->parseValue() : $this->parseProperties();
+public function saveValue(Metadata $xMetadata, string $sMethod = '*'): void
+{
+isset($this->properties['__value__']) ? $this->parseValue() : $this->parseProperties();
 
-        // The type in the @di annotations can be set from the values in the @var annotations
-        $aPropTypes = self::$xReader->getPropTypes();
-        if($this->sClass === '')
-        {
-            if(!isset($aPropTypes[$this->sAttr]))
-            {
-                throw new AnnotationException('No class defined for @di on attribute "' .
-                    $this->sAttr . '".');
-            }
-            $this->sClass = ltrim($aPropTypes[$this->sAttr], '\\');
-        }
+// The type in the @di annotations can be set from the values in the @var annotations
+$aPropTypes = self::$xReader->getPropTypes();
+if($this->sClass === '')
+{
+if(!isset($aPropTypes[$this->sAttr]))
+{
+    throw new AnnotationException('No class defined for @di on attribute "' .
+        $this->sAttr . '".');
+}
+$this->sClass = ltrim($aPropTypes[$this->sAttr], '\\');
+}
 
-        $xMetadata->container($sMethod)->addValue($this->sAttr, $this->sClass);
-    }
+$xMetadata->container($sMethod)->addValue($this->sAttr, $this->sClass);
+}
 }

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/AfterAnnotation.php

Switch Indentation +10 added lines, -10 removed lines

@@ -23,19 +23,19 @@
  */
 class AfterAnnotation extends HookAnnotation
 {
-    /**
+/**
      * @inheritDoc
      */
-    protected static function getType(): string
-    {
-        return 'after';
-    }
+protected static function getType(): string
+{
+return 'after';
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function saveValue(Metadata $xMetadata, string $sMethod = '*'): void
-    {
-        $xMetadata->after($sMethod)->addCall($this->sMethod, $this->aParams);
-    }
+public function saveValue(Metadata $xMetadata, string $sMethod = '*'): void
+{
+$xMetadata->after($sMethod)->addCall($this->sMethod, $this->aParams);
+}
 }

jaxon-annotations/src/Annotation/CallbackAnnotation.php

Switch Indentation +22 added lines, -22 removed lines

@@ -28,40 +28,40 @@
  */
 class CallbackAnnotation extends AbstractAnnotation
 {
-    /**
+/**
      * The javascript object name
      *
      * @var string
      */
-    protected $sJsObject;
+protected $sJsObject;
 
-    /**
+/**
      * @inheritDoc
      */
-    public static function parseAnnotation($value)
-    {
-        $aParams = preg_split('/[\s]+/', $value, 2);
-        return count($aParams) === 1 ? ['name' => $aParams[0]] : ['name' => $aParams[0], 'extra' => $aParams[1]];
-    }
+public static function parseAnnotation($value)
+{
+$aParams = preg_split('/[\s]+/', $value, 2);
+return count($aParams) === 1 ? ['name' => $aParams[0]] : ['name' => $aParams[0], 'extra' => $aParams[1]];
+}
 
-    /**
+/**
      * @inheritDoc
      * @throws AnnotationException
      */
-    public function initAnnotation(array $properties)
-    {
-        if(count($properties) !== 1 || !isset($properties['name']) || !is_string($properties['name']))
-        {
-            throw new AnnotationException('the @callback annotation requires a single string as property');
-        }
-        $this->sJsObject = $properties['name'];
-    }
+public function initAnnotation(array $properties)
+{
+if(count($properties) !== 1 || !isset($properties['name']) || !is_string($properties['name']))
+{
+throw new AnnotationException('the @callback annotation requires a single string as property');
+}
+$this->sJsObject = $properties['name'];
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function saveValue(Metadata $xMetadata, string $sMethod = '*'): void
-    {
-        $xMetadata->callback($sMethod)->addValue($this->sJsObject);
-    }
+public function saveValue(Metadata $xMetadata, string $sMethod = '*'): void
+{
+$xMetadata->callback($sMethod)->addValue($this->sJsObject);
+}
 }

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/BeforeAnnotation.php

Switch Indentation +10 added lines, -10 removed lines

@@ -23,19 +23,19 @@
  */
 class BeforeAnnotation extends HookAnnotation
 {
-    /**
+/**
      * @inheritDoc
      */
-    protected static function getType(): string
-    {
-        return 'before';
-    }
+protected static function getType(): string
+{
+return 'before';
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function saveValue(Metadata $xMetadata, string $sMethod = '*'): void
-    {
-        $xMetadata->before($sMethod)->addCall($this->sMethod, $this->aParams);
-    }
+public function saveValue(Metadata $xMetadata, string $sMethod = '*'): void
+{
+$xMetadata->before($sMethod)->addCall($this->sMethod, $this->aParams);
+}
 }

jaxon-annotations/src/Annotation/ExcludeAnnotation.php

Switch Indentation +22 added lines, -22 removed lines

@@ -27,38 +27,38 @@
  */
 class ExcludeAnnotation extends AbstractAnnotation
 {
-    /**
+/**
      * @var bool
      */
-    protected $bValue;
+protected $bValue;
 
-    /**
+/**
      * @inheritDoc
      */
-    public static function parseAnnotation($value)
-    {
-        return [$value === 'true' ? true : ($value === 'false' ? false : $value)];
-    }
+public static function parseAnnotation($value)
+{
+return [$value === 'true' ? true : ($value === 'false' ? false : $value)];
+}
 
-    /**
+/**
      * @inheritDoc
      * @throws AnnotationException
      */
-    public function initAnnotation(array $properties)
-    {
-        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');
-        }
-        $this->bValue = $properties[0] ?? true;
-    }
+public function initAnnotation(array $properties)
+{
+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');
+}
+$this->bValue = $properties[0] ?? true;
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function saveValue(Metadata $xMetadata, string $sMethod = '*'): void
-    {
-        $xMetadata->exclude($sMethod)->setValue($this->bValue);
-    }
+public function saveValue(Metadata $xMetadata, string $sMethod = '*'): void
+{
+$xMetadata->exclude($sMethod)->setValue($this->bValue);
+}
 }

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

Switch Indentation +24 added lines, -24 removed lines

@@ -28,42 +28,42 @@
  */
 class UploadAnnotation extends AbstractAnnotation
 {
-    /**
+/**
      * The name of the upload field
      *
      * @var string
      */
-    protected $sField = '';
+protected $sField = '';
 
-    /**
+/**
      * @inheritDoc
      */
-    public static function parseAnnotation($value)
-    {
-        $aParams = preg_split('/[\s]+/', $value, 2);
-        return count($aParams) === 1 ? ['field' => $aParams[0]] :
-            ['field' => $aParams[0], 'extra' => $aParams[1]];
-    }
+public static function parseAnnotation($value)
+{
+$aParams = preg_split('/[\s]+/', $value, 2);
+return count($aParams) === 1 ? ['field' => $aParams[0]] :
+['field' => $aParams[0], 'extra' => $aParams[1]];
+}
 
-    /**
+/**
      * @inheritDoc
      * @throws AnnotationException
      */
-    public function initAnnotation(array $properties)
-    {
-        if(count($properties) != 1 || !isset($properties['field']) ||
-            !is_string($properties['field']))
-        {
-            throw new AnnotationException('The @upload annotation requires a property "field" of type string');
-        }
-        $this->sField = $properties['field'];
-    }
+public function initAnnotation(array $properties)
+{
+if(count($properties) != 1 || !isset($properties['field']) ||
+!is_string($properties['field']))
+{
+throw new AnnotationException('The @upload annotation requires a property "field" of type string');
+}
+$this->sField = $properties['field'];
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function saveValue(Metadata $xMetadata, string $sMethod = '*'): void
-    {
-        $xMetadata->upload($sMethod)->setValue($this->sField);
-    }
+public function saveValue(Metadata $xMetadata, string $sMethod = '*'): void
+{
+$xMetadata->upload($sMethod)->setValue($this->sField);
+}
 }

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

jaxon-annotations/src/Annotation/HookAnnotation.php

Switch Indentation +45 added lines, -45 removed lines

@@ -27,64 +27,64 @@
 
 abstract class HookAnnotation extends AbstractAnnotation
 {
-    /**
+/**
      * @var string
      */
-    protected $sMethod = '';
+protected $sMethod = '';
 
-    /**
+/**
      * @var array
      */
-    protected $aParams = [];
+protected $aParams = [];
 
-    /**
+/**
      *
      */
-    abstract protected static function getType(): string;
+abstract protected static function getType(): string;
 
-    /**
+/**
      * @inheritDoc
      */
-    public static function parseAnnotation($value)
-    {
-        $aParams = preg_split('/[\s]+/', $value, 2);
-        if(count($aParams) === 1)
-        {
-            return ['call' => rtrim($aParams[0])];
-        }
-        // The second parameter must be an array of callback parameter in json format.
-        return ['call' => rtrim($aParams[0]), 'with' => json_decode($aParams[1], false)];
-    }
+public static function parseAnnotation($value)
+{
+$aParams = preg_split('/[\s]+/', $value, 2);
+if(count($aParams) === 1)
+{
+return ['call' => rtrim($aParams[0])];
+}
+// The second parameter must be an array of callback parameter in json format.
+return ['call' => rtrim($aParams[0]), 'with' => json_decode($aParams[1], false)];
+}
 
-    /**
+/**
      * @inheritDoc
      * @throws AnnotationException
      */
-    public function initAnnotation(array $properties)
-    {
-        if(!isset($properties['call']) || !is_string($properties['call']))
-        {
-            throw new AnnotationException('The @' . $this->getType() .
-                ' annotation requires a property "call" of type string');
-        }
-        foreach(array_keys($properties) as $propName)
-        {
-            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(!is_array($properties['with']))
-            {
-                throw new AnnotationException('The "with" property of the @' .
-                    $this->getType() . ' annotation must be of type array');
-            }
-            $this->aParams = $properties['with'];
-        }
-        $this->sMethod = $properties['call'];
-    }
+public function initAnnotation(array $properties)
+{
+if(!isset($properties['call']) || !is_string($properties['call']))
+{
+throw new AnnotationException('The @' . $this->getType() .
+    ' annotation requires a property "call" of type string');
+}
+foreach(array_keys($properties) as $propName)
+{
+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(!is_array($properties['with']))
+{
+    throw new AnnotationException('The "with" property of the @' .
+        $this->getType() . ' annotation must be of type array');
+}
+$this->aParams = $properties['with'];
+}
+$this->sMethod = $properties['call'];
+}
 }

Spacing +6 added lines, -6 removed lines

@@ -48,7 +48,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])];
         }
@@ -62,23 +62,23 @@ 
      */
     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');
         }
-        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');

jaxon-annotations/src/Annotation/DataBagAnnotation.php

Switch Indentation +22 added lines, -22 removed lines

@@ -28,40 +28,40 @@
  */
 class DataBagAnnotation extends AbstractAnnotation
 {
-    /**
+/**
      * The data bag name
      *
      * @var string
      */
-    protected $sName = '';
+protected $sName = '';
 
-    /**
+/**
      * @inheritDoc
      */
-    public static function parseAnnotation($value)
-    {
-        $aParams = preg_split('/[\s]+/', $value, 2);
-        return count($aParams) === 1 ? ['name' => $aParams[0]] : ['name' => $aParams[0], 'extra' => $aParams[1]];
-    }
+public static function parseAnnotation($value)
+{
+$aParams = preg_split('/[\s]+/', $value, 2);
+return count($aParams) === 1 ? ['name' => $aParams[0]] : ['name' => $aParams[0], 'extra' => $aParams[1]];
+}
 
-    /**
+/**
      * @inheritDoc
      * @throws AnnotationException
      */
-    public function initAnnotation(array $properties)
-    {
-        if(count($properties) !== 1 || !isset($properties['name']) || !is_string($properties['name']))
-        {
-            throw new AnnotationException('The @databag annotation requires a property "name" of type string');
-        }
-        $this->sName = $properties['name'];
-    }
+public function initAnnotation(array $properties)
+{
+if(count($properties) !== 1 || !isset($properties['name']) || !is_string($properties['name']))
+{
+throw new AnnotationException('The @databag annotation requires a property "name" of type string');
+}
+$this->sName = $properties['name'];
+}
 
-    /**
+/**
      * @inheritDoc
      */
-    public function saveValue(Metadata $xMetadata, string $sMethod = '*'): void
-    {
-        $xMetadata->databag($sMethod)->addValue($this->sName);
-    }
+public function saveValue(Metadata $xMetadata, string $sMethod = '*'): void
+{
+$xMetadata->databag($sMethod)->addValue($this->sName);
+}
 }

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 @databag annotation requires a property "name" of type string');
         }