jaxon-php / jaxon-mono

jaxon-core/src/Request/Handler/ParameterReader.php

Switch Indentation +60 added lines, -60 removed lines

@@ -40,7 +40,7 @@ 
 
 class ParameterReader
 {
-    /**
+/**
      * The constructor
      *
      * @param Container $di
@@ -48,28 +48,28 @@ 
      * @param ConfigManager $xConfigManager
      * @param UriDetector $xUriDetector
      */
-    public function __construct(private Container $di, private Translator $xTranslator,
-        private ConfigManager $xConfigManager, private UriDetector $xUriDetector)
-    {}
+public function __construct(private Container $di, private Translator $xTranslator,
+private ConfigManager $xConfigManager, private UriDetector $xUriDetector)
+{}
 
-    /**
+/**
      * Decode input data.
      *
      * @param string $sStr
      *
      * @return string
      */
-    private function decodeStr(string $sStr): string
-    {
-        $aServerParams = $this->di->getServerParams();
-        $sContentType = $aServerParams['CONTENT_TYPE'] ?? $aServerParams['HTTP_CONTENT_TYPE'] ?? '';
-        $sType = 'multipart/form-data';
-        // Parameters are url encoded when uploading files
-        return strncmp($sContentType, $sType, strlen($sType)) !== 0 ?
-            $sStr : urldecode($sStr);
-    }
+private function decodeStr(string $sStr): string
+{
+$aServerParams = $this->di->getServerParams();
+$sContentType = $aServerParams['CONTENT_TYPE'] ?? $aServerParams['HTTP_CONTENT_TYPE'] ?? '';
+$sType = 'multipart/form-data';
+// Parameters are url encoded when uploading files
+return strncmp($sContentType, $sType, strlen($sType)) !== 0 ?
+$sStr : urldecode($sStr);
+}
 
-    /**
+/**
      * Decode input data.
      *
      * @param string $sStr
@@ -77,73 +77,73 @@ 
      * @return string
      * @throws RequestException
      */
-    private function decoderUtf8Str(string $sStr): string
-    {
-        $sEncoding = $this->xConfigManager->getOption('core.encoding', '');
-        if(function_exists('iconv'))
-        {
-            return iconv("UTF-8", $sEncoding . '//TRANSLIT', $sStr);
-        }
-        if(function_exists('mb_convert_encoding'))
-        {
-            return mb_convert_encoding($sStr, $sEncoding, "UTF-8");
-        }
-        // By default, no decoding
-        // return $sStr;
-        throw new RequestException($this->xTranslator->trans('errors.request.conversion'));
-    }
+private function decoderUtf8Str(string $sStr): string
+{
+$sEncoding = $this->xConfigManager->getOption('core.encoding', '');
+if(function_exists('iconv'))
+{
+return iconv("UTF-8", $sEncoding . '//TRANSLIT', $sStr);
+}
+if(function_exists('mb_convert_encoding'))
+{
+return mb_convert_encoding($sStr, $sEncoding, "UTF-8");
+}
+// By default, no decoding
+// return $sStr;
+throw new RequestException($this->xTranslator->trans('errors.request.conversion'));
+}
 
-    /**
+/**
      * Choose the function to use to decode input data.
      *
      * @param string $sParam
      *
      * @return string
      */
-    private function decodeRequestParameter(string $sParam): string
-    {
-        $sParam = $this->decodeStr($sParam);
-        if(!$this->xConfigManager->getOption('core.decode_utf8'))
-        {
-            return $sParam;
-        }
-        $this->xConfigManager->setOption('core.decode_utf8', false);
-        return $this->decoderUtf8Str($sParam);
-    }
+private function decodeRequestParameter(string $sParam): string
+{
+$sParam = $this->decodeStr($sParam);
+if(!$this->xConfigManager->getOption('core.decode_utf8'))
+{
+return $sParam;
+}
+$this->xConfigManager->setOption('core.decode_utf8', false);
+return $this->decoderUtf8Str($sParam);
+}
 
-    /**
+/**
      * @param ServerRequestInterface $xRequest
      *
      * @return array|null
      */
-    public function getRequestParameter(ServerRequestInterface $xRequest): ?array
-    {
-        $aBody = $xRequest->getParsedBody();
-        $aParams = is_array($aBody) ? $aBody : $xRequest->getQueryParams();
-        // Check if Jaxon call parameters are present.
-        return !isset($aParams['jxncall']) || !is_string($aParams['jxncall']) ? null :
-            json_decode($this->decodeRequestParameter($aParams['jxncall']), true);
-    }
+public function getRequestParameter(ServerRequestInterface $xRequest): ?array
+{
+$aBody = $xRequest->getParsedBody();
+$aParams = is_array($aBody) ? $aBody : $xRequest->getQueryParams();
+// Check if Jaxon call parameters are present.
+return !isset($aParams['jxncall']) || !is_string($aParams['jxncall']) ? null :
+json_decode($this->decodeRequestParameter($aParams['jxncall']), true);
+}
 
-    /**
+/**
      * Get the URI of the current request
      *
      * @throws UriException
      */
-    public function uri(): string
-    {
-        return $this->xUriDetector->detect($this->di->getServerParams());
-    }
+public function uri(): string
+{
+return $this->xUriDetector->detect($this->di->getServerParams());
+}
 
-    /**
+/**
      * Make the specified URL suitable for redirect
      *
      * @param string $sURL    The relative or fully qualified URL
      *
      * @return string
      */
-    public function parseUrl(string $sURL): string
-    {
-        return $this->xUriDetector->redirect($sURL, $this->di->getServerParams());
-    }
+public function parseUrl(string $sURL): string
+{
+return $this->xUriDetector->redirect($sURL, $this->di->getServerParams());
+}
 }

jaxon-core/src/Request/Upload/FileInterface.php

Switch Indentation +14 added lines, -14 removed lines

@@ -18,52 +18,52 @@
 
 interface FileInterface
 {
-    /**
+/**
      * Get the filesystem where the file is stored
      *
      * @return Filesystem
      */
-    public function filesystem(): Filesystem;
+public function filesystem(): Filesystem;
 
-    /**
+/**
      * Get the uploaded file type
      *
      * @return string
      */
-    public function type(): string;
+public function type(): string;
 
-    /**
+/**
      * Get the uploaded file name, without the extension and slugified
      *
      * @return string
      */
-    public function name(): string;
+public function name(): string;
 
-    /**
+/**
      * Get the uploaded file name, with the extension
      *
      * @return string
      */
-    public function filename(): string;
+public function filename(): string;
 
-    /**
+/**
      * Get the uploaded file path
      *
      * @return string
      */
-    public function path(): string;
+public function path(): string;
 
-    /**
+/**
      * Get the uploaded file size
      *
      * @return int
      */
-    public function size(): int;
+public function size(): int;
 
-    /**
+/**
      * Get the uploaded file extension
      *
      * @return string
      */
-    public function extension(): string;
+public function extension(): string;
 }

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);
+}
 }

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);
+}
 }

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);
+}
 }

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'];
+}
 }

jaxon-core/src/Plugin/AbstractRequestPlugin.php

Switch Indentation +7 added lines, -7 removed lines

@@ -30,16 +30,16 @@
 
 abstract class AbstractRequestPlugin extends AbstractPlugin implements CallableRegistryInterface, RequestHandlerInterface
 {
-    /**
+/**
      * @var Target
      */
-    protected $xTarget = null;
+protected $xTarget = null;
 
-    /**
+/**
      * @inheritDoc
      */
-    public function getTarget(): ?Target
-    {
-        return $this->xTarget;
-    }
+public function getTarget(): ?Target
+{
+return $this->xTarget;
+}
 }