Passed
Push — main ( 273db0...683317 )
by Thierry
03:54
created
jaxon-annotations/src/Annotation/BeforeAnnotation.php 1 patch
Switch Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -23,19 +23,19 @@
 block discarded – undo
23 23
  */
24 24
 class BeforeAnnotation extends HookAnnotation
25 25
 {
26
-    /**
26
+/**
27 27
      * @inheritDoc
28 28
      */
29
-    protected static function getType(): string
30
-    {
31
-        return 'before';
32
-    }
29
+protected static function getType(): string
30
+{
31
+return 'before';
32
+}
33 33
 
34
-    /**
34
+/**
35 35
      * @inheritDoc
36 36
      */
37
-    public function saveValue(Metadata $xMetadata, string $sMethod = '*'): void
38
-    {
39
-        $xMetadata->before($sMethod)->addCall($this->sMethod, $this->aParams);
40
-    }
37
+public function saveValue(Metadata $xMetadata, string $sMethod = '*'): void
38
+{
39
+$xMetadata->before($sMethod)->addCall($this->sMethod, $this->aParams);
40
+}
41 41
 }
Please login to merge, or discard this patch.
jaxon-annotations/src/Annotation/ExcludeAnnotation.php 2 patches
Switch Indentation   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -27,38 +27,38 @@
 block discarded – undo
27 27
  */
28 28
 class ExcludeAnnotation extends AbstractAnnotation
29 29
 {
30
-    /**
30
+/**
31 31
      * @var bool
32 32
      */
33
-    protected $bValue;
33
+protected $bValue;
34 34
 
35
-    /**
35
+/**
36 36
      * @inheritDoc
37 37
      */
38
-    public static function parseAnnotation($value)
39
-    {
40
-        return [$value === 'true' ? true : ($value === 'false' ? false : $value)];
41
-    }
38
+public static function parseAnnotation($value)
39
+{
40
+return [$value === 'true' ? true : ($value === 'false' ? false : $value)];
41
+}
42 42
 
43
-    /**
43
+/**
44 44
      * @inheritDoc
45 45
      * @throws AnnotationException
46 46
      */
47
-    public function initAnnotation(array $properties)
48
-    {
49
-        if(count($properties) !== 0 && (count($properties) !== 1
50
-            || !isset($properties[0]) || !is_bool($properties[0])))
51
-        {
52
-            throw new AnnotationException('the @exclude annotation requires a single boolean or no property');
53
-        }
54
-        $this->bValue = $properties[0] ?? true;
55
-    }
47
+public function initAnnotation(array $properties)
48
+{
49
+if(count($properties) !== 0 && (count($properties) !== 1
50
+|| !isset($properties[0]) || !is_bool($properties[0])))
51
+{
52
+throw new AnnotationException('the @exclude annotation requires a single boolean or no property');
53
+}
54
+$this->bValue = $properties[0] ?? true;
55
+}
56 56
 
57
-    /**
57
+/**
58 58
      * @inheritDoc
59 59
      */
60
-    public function saveValue(Metadata $xMetadata, string $sMethod = '*'): void
61
-    {
62
-        $xMetadata->exclude($sMethod)->setValue($this->bValue);
63
-    }
60
+public function saveValue(Metadata $xMetadata, string $sMethod = '*'): void
61
+{
62
+$xMetadata->exclude($sMethod)->setValue($this->bValue);
63
+}
64 64
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@
 block discarded – undo
46 46
      */
47 47
     public function initAnnotation(array $properties)
48 48
     {
49
-        if(count($properties) !== 0 && (count($properties) !== 1
49
+        if (count($properties) !== 0 && (count($properties) !== 1
50 50
             || !isset($properties[0]) || !is_bool($properties[0])))
51 51
         {
52 52
             throw new AnnotationException('the @exclude annotation requires a single boolean or no property');
Please login to merge, or discard this patch.
jaxon-annotations/src/Annotation/UploadAnnotation.php 2 patches
Switch Indentation   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -28,42 +28,42 @@
 block discarded – undo
28 28
  */
29 29
 class UploadAnnotation extends AbstractAnnotation
30 30
 {
31
-    /**
31
+/**
32 32
      * The name of the upload field
33 33
      *
34 34
      * @var string
35 35
      */
36
-    protected $sField = '';
36
+protected $sField = '';
37 37
 
38
-    /**
38
+/**
39 39
      * @inheritDoc
40 40
      */
41
-    public static function parseAnnotation($value)
42
-    {
43
-        $aParams = preg_split('/[\s]+/', $value, 2);
44
-        return count($aParams) === 1 ? ['field' => $aParams[0]] :
45
-            ['field' => $aParams[0], 'extra' => $aParams[1]];
46
-    }
41
+public static function parseAnnotation($value)
42
+{
43
+$aParams = preg_split('/[\s]+/', $value, 2);
44
+return count($aParams) === 1 ? ['field' => $aParams[0]] :
45
+['field' => $aParams[0], 'extra' => $aParams[1]];
46
+}
47 47
 
48
-    /**
48
+/**
49 49
      * @inheritDoc
50 50
      * @throws AnnotationException
51 51
      */
52
-    public function initAnnotation(array $properties)
53
-    {
54
-        if(count($properties) != 1 || !isset($properties['field']) ||
55
-            !is_string($properties['field']))
56
-        {
57
-            throw new AnnotationException('The @upload annotation requires a property "field" of type string');
58
-        }
59
-        $this->sField = $properties['field'];
60
-    }
52
+public function initAnnotation(array $properties)
53
+{
54
+if(count($properties) != 1 || !isset($properties['field']) ||
55
+!is_string($properties['field']))
56
+{
57
+throw new AnnotationException('The @upload annotation requires a property "field" of type string');
58
+}
59
+$this->sField = $properties['field'];
60
+}
61 61
 
62
-    /**
62
+/**
63 63
      * @inheritDoc
64 64
      */
65
-    public function saveValue(Metadata $xMetadata, string $sMethod = '*'): void
66
-    {
67
-        $xMetadata->upload($sMethod)->setValue($this->sField);
68
-    }
65
+public function saveValue(Metadata $xMetadata, string $sMethod = '*'): void
66
+{
67
+$xMetadata->upload($sMethod)->setValue($this->sField);
68
+}
69 69
 }
Please login to merge, or discard this patch.
Spacing   +2 added lines, -3 removed lines patch added patch discarded remove patch
@@ -41,8 +41,7 @@  discard block
 block discarded – undo
41 41
     public static function parseAnnotation($value)
42 42
     {
43 43
         $aParams = preg_split('/[\s]+/', $value, 2);
44
-        return count($aParams) === 1 ? ['field' => $aParams[0]] :
45
-            ['field' => $aParams[0], 'extra' => $aParams[1]];
44
+        return count($aParams) === 1 ? ['field' => $aParams[0]] : ['field' => $aParams[0], 'extra' => $aParams[1]];
46 45
     }
47 46
 
48 47
     /**
@@ -51,7 +50,7 @@  discard block
 block discarded – undo
51 50
      */
52 51
     public function initAnnotation(array $properties)
53 52
     {
54
-        if(count($properties) != 1 || !isset($properties['field']) ||
53
+        if (count($properties) != 1 || !isset($properties['field']) ||
55 54
             !is_string($properties['field']))
56 55
         {
57 56
             throw new AnnotationException('The @upload annotation requires a property "field" of type string');
Please login to merge, or discard this patch.
jaxon-annotations/src/Annotation/HookAnnotation.php 2 patches
Switch Indentation   +45 added lines, -45 removed lines patch added patch discarded remove patch
@@ -27,64 +27,64 @@
 block discarded – undo
27 27
 
28 28
 abstract class HookAnnotation extends AbstractAnnotation
29 29
 {
30
-    /**
30
+/**
31 31
      * @var string
32 32
      */
33
-    protected $sMethod = '';
33
+protected $sMethod = '';
34 34
 
35
-    /**
35
+/**
36 36
      * @var array
37 37
      */
38
-    protected $aParams = [];
38
+protected $aParams = [];
39 39
 
40
-    /**
40
+/**
41 41
      *
42 42
      */
43
-    abstract protected static function getType(): string;
43
+abstract protected static function getType(): string;
44 44
 
45
-    /**
45
+/**
46 46
      * @inheritDoc
47 47
      */
48
-    public static function parseAnnotation($value)
49
-    {
50
-        $aParams = preg_split('/[\s]+/', $value, 2);
51
-        if(count($aParams) === 1)
52
-        {
53
-            return ['call' => rtrim($aParams[0])];
54
-        }
55
-        // The second parameter must be an array of callback parameter in json format.
56
-        return ['call' => rtrim($aParams[0]), 'with' => json_decode($aParams[1], false)];
57
-    }
48
+public static function parseAnnotation($value)
49
+{
50
+$aParams = preg_split('/[\s]+/', $value, 2);
51
+if(count($aParams) === 1)
52
+{
53
+return ['call' => rtrim($aParams[0])];
54
+}
55
+// The second parameter must be an array of callback parameter in json format.
56
+return ['call' => rtrim($aParams[0]), 'with' => json_decode($aParams[1], false)];
57
+}
58 58
 
59
-    /**
59
+/**
60 60
      * @inheritDoc
61 61
      * @throws AnnotationException
62 62
      */
63
-    public function initAnnotation(array $properties)
64
-    {
65
-        if(!isset($properties['call']) || !is_string($properties['call']))
66
-        {
67
-            throw new AnnotationException('The @' . $this->getType() .
68
-                ' annotation requires a property "call" of type string');
69
-        }
70
-        foreach(array_keys($properties) as $propName)
71
-        {
72
-            if($propName !== 'call' && $propName !== 'with')
73
-            {
74
-                throw new AnnotationException('Unknown property "' . $propName .
75
-                    '" in the @' . $this->getType() . ' annotation');
76
-            }
77
-        }
78
-        // Cannot use isset here, because it will return false in case $properties['with'] === null
79
-        if(array_key_exists('with', $properties))
80
-        {
81
-            if(!is_array($properties['with']))
82
-            {
83
-                throw new AnnotationException('The "with" property of the @' .
84
-                    $this->getType() . ' annotation must be of type array');
85
-            }
86
-            $this->aParams = $properties['with'];
87
-        }
88
-        $this->sMethod = $properties['call'];
89
-    }
63
+public function initAnnotation(array $properties)
64
+{
65
+if(!isset($properties['call']) || !is_string($properties['call']))
66
+{
67
+throw new AnnotationException('The @' . $this->getType() .
68
+    ' annotation requires a property "call" of type string');
69
+}
70
+foreach(array_keys($properties) as $propName)
71
+{
72
+if($propName !== 'call' && $propName !== 'with')
73
+{
74
+    throw new AnnotationException('Unknown property "' . $propName .
75
+        '" in the @' . $this->getType() . ' annotation');
76
+}
77
+}
78
+// Cannot use isset here, because it will return false in case $properties['with'] === null
79
+if(array_key_exists('with', $properties))
80
+{
81
+if(!is_array($properties['with']))
82
+{
83
+    throw new AnnotationException('The "with" property of the @' .
84
+        $this->getType() . ' annotation must be of type array');
85
+}
86
+$this->aParams = $properties['with'];
87
+}
88
+$this->sMethod = $properties['call'];
89
+}
90 90
 }
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
     public static function parseAnnotation($value)
49 49
     {
50 50
         $aParams = preg_split('/[\s]+/', $value, 2);
51
-        if(count($aParams) === 1)
51
+        if (count($aParams) === 1)
52 52
         {
53 53
             return ['call' => rtrim($aParams[0])];
54 54
         }
@@ -62,23 +62,23 @@  discard block
 block discarded – undo
62 62
      */
63 63
     public function initAnnotation(array $properties)
64 64
     {
65
-        if(!isset($properties['call']) || !is_string($properties['call']))
65
+        if (!isset($properties['call']) || !is_string($properties['call']))
66 66
         {
67 67
             throw new AnnotationException('The @' . $this->getType() .
68 68
                 ' annotation requires a property "call" of type string');
69 69
         }
70
-        foreach(array_keys($properties) as $propName)
70
+        foreach (array_keys($properties) as $propName)
71 71
         {
72
-            if($propName !== 'call' && $propName !== 'with')
72
+            if ($propName !== 'call' && $propName !== 'with')
73 73
             {
74 74
                 throw new AnnotationException('Unknown property "' . $propName .
75 75
                     '" in the @' . $this->getType() . ' annotation');
76 76
             }
77 77
         }
78 78
         // Cannot use isset here, because it will return false in case $properties['with'] === null
79
-        if(array_key_exists('with', $properties))
79
+        if (array_key_exists('with', $properties))
80 80
         {
81
-            if(!is_array($properties['with']))
81
+            if (!is_array($properties['with']))
82 82
             {
83 83
                 throw new AnnotationException('The "with" property of the @' .
84 84
                     $this->getType() . ' annotation must be of type array');
Please login to merge, or discard this patch.
jaxon-annotations/src/AnnotationReader.php 3 patches
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -232,8 +232,7 @@
 block discarded – undo
232 232
             }
233 233
 
234 234
             return $this->xMetadata;
235
-        }
236
-        catch(AnnotationException $e)
235
+        } catch(AnnotationException $e)
237 236
         {
238 237
             throw new SetupException($e->getMessage());
239 238
         }
Please login to merge, or discard this patch.
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -116,21 +116,21 @@  discard block
 block discarded – undo
116 116
             fn($xAnnotation) => is_a($xAnnotation, AbstractAnnotation::class)
117 117
         );
118 118
         // First check if the class is excluded.
119
-        foreach($aAnnotations as $xAnnotation)
119
+        foreach ($aAnnotations as $xAnnotation)
120 120
         {
121
-            if(is_a($xAnnotation, ExcludeAnnotation::class))
121
+            if (is_a($xAnnotation, ExcludeAnnotation::class))
122 122
             {
123 123
                 $xAnnotation->saveValue($this->xMetadata);
124 124
             }
125 125
         }
126
-        if($this->xMetadata->isExcluded())
126
+        if ($this->xMetadata->isExcluded())
127 127
         {
128 128
             return;
129 129
         }
130 130
 
131
-        foreach($aAnnotations as $xAnnotation)
131
+        foreach ($aAnnotations as $xAnnotation)
132 132
         {
133
-            if(!is_a($xAnnotation, ExcludeAnnotation::class))
133
+            if (!is_a($xAnnotation, ExcludeAnnotation::class))
134 134
             {
135 135
                 $xAnnotation->saveValue($this->xMetadata);
136 136
             }
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
             $this->xManager->getPropertyAnnotations($sClass, $sProperty),
153 153
             function($xAnnotation) use($sProperty) {
154 154
                 // Save the property type
155
-                if(is_a($xAnnotation, VarAnnotation::class))
155
+                if (is_a($xAnnotation, VarAnnotation::class))
156 156
                 {
157 157
                     $this->aPropTypes[$sProperty] = $xAnnotation->type;
158 158
                 }
@@ -160,12 +160,12 @@  discard block
 block discarded – undo
160 160
                 return is_a($xAnnotation, ContainerAnnotation::class);
161 161
             }
162 162
         );
163
-        if(count($aAnnotations) > 1)
163
+        if (count($aAnnotations) > 1)
164 164
         {
165 165
             throw new AnnotationException('Only one @di annotation is allowed on a property');
166 166
         }
167 167
 
168
-        foreach($aAnnotations as $xAnnotation)
168
+        foreach ($aAnnotations as $xAnnotation)
169 169
         {
170 170
             $xAnnotation->setAttr($sProperty);
171 171
             $xAnnotation->saveValue($this->xMetadata);
@@ -187,7 +187,7 @@  discard block
 block discarded – undo
187 187
             $this->xManager->getMethodAnnotations($sClass, $sMethod),
188 188
             fn($xAnnotation) => is_a($xAnnotation, AbstractAnnotation::class)
189 189
         );
190
-        foreach($aAnnotations as $xAnnotation)
190
+        foreach ($aAnnotations as $xAnnotation)
191 191
         {
192 192
             $xAnnotation->saveValue($this->xMetadata, $sMethod);
193 193
         }
@@ -214,13 +214,13 @@  discard block
 block discarded – undo
214 214
             $this->sCurrMemberType = AnnotationManager::MEMBER_PROPERTY;
215 215
 
216 216
             // Properties annotations
217
-            foreach($xInput->getProperties() as $sProperty)
217
+            foreach ($xInput->getProperties() as $sProperty)
218 218
             {
219 219
                 $this->readPropertyAnnotations($sClass, $sProperty);
220 220
             }
221 221
 
222 222
             // The methods annotations are not taken for excluded classes.
223
-            if($this->xMetadata->isExcluded())
223
+            if ($this->xMetadata->isExcluded())
224 224
             {
225 225
                 return $this->xMetadata;
226 226
             }
@@ -228,14 +228,14 @@  discard block
 block discarded – undo
228 228
             // Processing methods annotations
229 229
             $this->sCurrMemberType = AnnotationManager::MEMBER_METHOD;
230 230
 
231
-            foreach($xInput->getMethods() as $sMethod)
231
+            foreach ($xInput->getMethods() as $sMethod)
232 232
             {
233 233
                 $this->readMethodAnnotations($sClass, $sMethod);
234 234
             }
235 235
 
236 236
             return $this->xMetadata;
237 237
         }
238
-        catch(AnnotationException $e)
238
+        catch (AnnotationException $e)
239 239
         {
240 240
             throw new SetupException($e->getMessage());
241 241
         }
Please login to merge, or discard this patch.
Switch Indentation   +152 added lines, -152 removed lines patch added patch discarded remove patch
@@ -37,207 +37,207 @@
 block discarded – undo
37 37
 
38 38
 class AnnotationReader implements MetadataReaderInterface
39 39
 {
40
-    /**
40
+/**
41 41
      * @var AnnotationManager
42 42
      */
43
-    protected $xManager;
43
+protected $xManager;
44 44
 
45
-    /**
45
+/**
46 46
      * @var Metadata
47 47
      */
48
-    protected $xMetadata;
48
+protected $xMetadata;
49 49
 
50
-    /**
50
+/**
51 51
      * Properties types, read from the "var" annotations.
52 52
      *
53 53
      * @var array
54 54
      */
55
-    protected $aPropTypes;
55
+protected $aPropTypes;
56 56
 
57
-    /**
57
+/**
58 58
      * The type of the class member being currently processed.
59 59
      *
60 60
      * @var string
61 61
      */
62
-    protected $sCurrMemberType;
62
+protected $sCurrMemberType;
63 63
 
64
-    /**
64
+/**
65 65
      * The constructor
66 66
      *
67 67
      * @param AnnotationManager $xManager
68 68
      */
69
-    public function __construct(AnnotationManager $xManager)
70
-    {
71
-        $this->xManager = $xManager;
72
-        $this->xManager->registry['upload'] = UploadAnnotation::class;
73
-        $this->xManager->registry['databag'] = DatabagAnnotation::class;
74
-        $this->xManager->registry['exclude'] = ExcludeAnnotation::class;
75
-        $this->xManager->registry['export'] = ExportAnnotation::class;
76
-        $this->xManager->registry['before'] = BeforeAnnotation::class;
77
-        $this->xManager->registry['after'] = AfterAnnotation::class;
78
-        $this->xManager->registry['di'] = ContainerAnnotation::class;
79
-        $this->xManager->registry['callback'] = CallbackAnnotation::class;
80
-        // Missing standard annotations.
81
-        // We need to define this, otherwise they throw an exception, and make the whole processing fail.
82
-        $this->xManager->registry['const'] = false;
83
-        $this->xManager->registry['inheritDoc'] = false;
84
-        $this->xManager->registry['template'] = false;
85
-        $this->xManager->registry['param-closure-this'] = false;
86
-    }
69
+public function __construct(AnnotationManager $xManager)
70
+{
71
+$this->xManager = $xManager;
72
+$this->xManager->registry['upload'] = UploadAnnotation::class;
73
+$this->xManager->registry['databag'] = DatabagAnnotation::class;
74
+$this->xManager->registry['exclude'] = ExcludeAnnotation::class;
75
+$this->xManager->registry['export'] = ExportAnnotation::class;
76
+$this->xManager->registry['before'] = BeforeAnnotation::class;
77
+$this->xManager->registry['after'] = AfterAnnotation::class;
78
+$this->xManager->registry['di'] = ContainerAnnotation::class;
79
+$this->xManager->registry['callback'] = CallbackAnnotation::class;
80
+// Missing standard annotations.
81
+// We need to define this, otherwise they throw an exception, and make the whole processing fail.
82
+$this->xManager->registry['const'] = false;
83
+$this->xManager->registry['inheritDoc'] = false;
84
+$this->xManager->registry['template'] = false;
85
+$this->xManager->registry['param-closure-this'] = false;
86
+}
87 87
 
88
-    /**
88
+/**
89 89
      * @return array
90 90
      */
91
-    public function getPropTypes(): array
92
-    {
93
-        return $this->aPropTypes;
94
-    }
91
+public function getPropTypes(): array
92
+{
93
+return $this->aPropTypes;
94
+}
95 95
 
96
-    /**
96
+/**
97 97
      * @return bool
98 98
      */
99
-    public function annotationIsOnProperty(): bool
100
-    {
101
-        return $this->sCurrMemberType === AnnotationManager::MEMBER_PROPERTY;
102
-    }
99
+public function annotationIsOnProperty(): bool
100
+{
101
+return $this->sCurrMemberType === AnnotationManager::MEMBER_PROPERTY;
102
+}
103 103
 
104
-    /**
104
+/**
105 105
      * @param string $sClass
106 106
      *
107 107
      * @return void
108 108
      * @throws AnnotationException
109 109
      */
110
-    private function readClassAnnotations(string $sClass): void
111
-    {
112
-        // Only keep the annotations declared in this package.
113
-        /** @var array<AbstractAnnotation> */
114
-        $aAnnotations = array_filter(
115
-            $this->xManager->getClassAnnotations($sClass),
116
-            fn($xAnnotation) => is_a($xAnnotation, AbstractAnnotation::class)
117
-        );
118
-        // First check if the class is excluded.
119
-        foreach($aAnnotations as $xAnnotation)
120
-        {
121
-            if(is_a($xAnnotation, ExcludeAnnotation::class))
122
-            {
123
-                $xAnnotation->saveValue($this->xMetadata);
124
-            }
125
-        }
126
-        if($this->xMetadata->isExcluded())
127
-        {
128
-            return;
129
-        }
130
-
131
-        foreach($aAnnotations as $xAnnotation)
132
-        {
133
-            if(!is_a($xAnnotation, ExcludeAnnotation::class))
134
-            {
135
-                $xAnnotation->saveValue($this->xMetadata);
136
-            }
137
-        }
138
-    }
110
+private function readClassAnnotations(string $sClass): void
111
+{
112
+// Only keep the annotations declared in this package.
113
+/** @var array<AbstractAnnotation> */
114
+$aAnnotations = array_filter(
115
+$this->xManager->getClassAnnotations($sClass),
116
+fn($xAnnotation) => is_a($xAnnotation, AbstractAnnotation::class)
117
+);
118
+// First check if the class is excluded.
119
+foreach($aAnnotations as $xAnnotation)
120
+{
121
+if(is_a($xAnnotation, ExcludeAnnotation::class))
122
+{
123
+    $xAnnotation->saveValue($this->xMetadata);
124
+}
125
+}
126
+if($this->xMetadata->isExcluded())
127
+{
128
+return;
129
+}
139 130
 
140
-    /**
131
+foreach($aAnnotations as $xAnnotation)
132
+{
133
+if(!is_a($xAnnotation, ExcludeAnnotation::class))
134
+{
135
+    $xAnnotation->saveValue($this->xMetadata);
136
+}
137
+}
138
+}
139
+
140
+/**
141 141
      * @param string $sClass
142 142
      * @param string $sProperty
143 143
      *
144 144
      * @return void
145 145
      * @throws AnnotationException
146 146
      */
147
-    private function readPropertyAnnotations(string $sClass, string $sProperty): void
147
+private function readPropertyAnnotations(string $sClass, string $sProperty): void
148
+{
149
+/** @var array<ContainerAnnotation> */
150
+// Only keep the annotations declared in this package.
151
+$aAnnotations = array_filter(
152
+$this->xManager->getPropertyAnnotations($sClass, $sProperty),
153
+function($xAnnotation) use($sProperty) {
154
+    // Save the property type
155
+    if(is_a($xAnnotation, VarAnnotation::class))
148 156
     {
149
-        /** @var array<ContainerAnnotation> */
150
-        // Only keep the annotations declared in this package.
151
-        $aAnnotations = array_filter(
152
-            $this->xManager->getPropertyAnnotations($sClass, $sProperty),
153
-            function($xAnnotation) use($sProperty) {
154
-                // Save the property type
155
-                if(is_a($xAnnotation, VarAnnotation::class))
156
-                {
157
-                    $this->aPropTypes[$sProperty] = $xAnnotation->type;
158
-                }
159
-                // Only container annotations are allowed on properties
160
-                return is_a($xAnnotation, ContainerAnnotation::class);
161
-            }
162
-        );
163
-        if(count($aAnnotations) > 1)
164
-        {
165
-            throw new AnnotationException('Only one @di annotation is allowed on a property');
166
-        }
167
-
168
-        foreach($aAnnotations as $xAnnotation)
169
-        {
170
-            $xAnnotation->setAttr($sProperty);
171
-            $xAnnotation->saveValue($this->xMetadata);
172
-        }
157
+        $this->aPropTypes[$sProperty] = $xAnnotation->type;
173 158
     }
159
+    // Only container annotations are allowed on properties
160
+    return is_a($xAnnotation, ContainerAnnotation::class);
161
+}
162
+);
163
+if(count($aAnnotations) > 1)
164
+{
165
+throw new AnnotationException('Only one @di annotation is allowed on a property');
166
+}
167
+
168
+foreach($aAnnotations as $xAnnotation)
169
+{
170
+$xAnnotation->setAttr($sProperty);
171
+$xAnnotation->saveValue($this->xMetadata);
172
+}
173
+}
174 174
 
175
-    /**
175
+/**
176 176
      * @param string $sClass
177 177
      * @param string $sMethod
178 178
      *
179 179
      * @return void
180 180
      * @throws AnnotationException
181 181
      */
182
-    private function readMethodAnnotations(string $sClass, string $sMethod): void
183
-    {
184
-        // Only keep the annotations declared in this package.
185
-        /** @var array<AbstractAnnotation> */
186
-        $aAnnotations = array_filter(
187
-            $this->xManager->getMethodAnnotations($sClass, $sMethod),
188
-            fn($xAnnotation) => is_a($xAnnotation, AbstractAnnotation::class)
189
-        );
190
-        foreach($aAnnotations as $xAnnotation)
191
-        {
192
-            $xAnnotation->saveValue($this->xMetadata, $sMethod);
193
-        }
194
-    }
182
+private function readMethodAnnotations(string $sClass, string $sMethod): void
183
+{
184
+// Only keep the annotations declared in this package.
185
+/** @var array<AbstractAnnotation> */
186
+$aAnnotations = array_filter(
187
+$this->xManager->getMethodAnnotations($sClass, $sMethod),
188
+fn($xAnnotation) => is_a($xAnnotation, AbstractAnnotation::class)
189
+);
190
+foreach($aAnnotations as $xAnnotation)
191
+{
192
+$xAnnotation->saveValue($this->xMetadata, $sMethod);
193
+}
194
+}
195 195
 
196
-    /**
196
+/**
197 197
      * @throws SetupException
198 198
      */
199
-    public function getAttributes(InputData $xInput): Metadata
200
-    {
201
-        ContainerAnnotation::$xReader = $this;
202
-        $this->aPropTypes = [];
203
-        $this->xMetadata = new Metadata();
204
-        $sClass = $xInput->getReflectionClass()->getName();
205
-
206
-        try
207
-        {
208
-            // Processing class annotations
209
-            $this->sCurrMemberType = AnnotationManager::MEMBER_CLASS;
210
-
211
-            $this->readClassAnnotations($sClass);
212
-
213
-            // Processing properties annotations
214
-            $this->sCurrMemberType = AnnotationManager::MEMBER_PROPERTY;
215
-
216
-            // Properties annotations
217
-            foreach($xInput->getProperties() as $sProperty)
218
-            {
219
-                $this->readPropertyAnnotations($sClass, $sProperty);
220
-            }
221
-
222
-            // The methods annotations are not taken for excluded classes.
223
-            if($this->xMetadata->isExcluded())
224
-            {
225
-                return $this->xMetadata;
226
-            }
227
-
228
-            // Processing methods annotations
229
-            $this->sCurrMemberType = AnnotationManager::MEMBER_METHOD;
230
-
231
-            foreach($xInput->getMethods() as $sMethod)
232
-            {
233
-                $this->readMethodAnnotations($sClass, $sMethod);
234
-            }
235
-
236
-            return $this->xMetadata;
237
-        }
238
-        catch(AnnotationException $e)
239
-        {
240
-            throw new SetupException($e->getMessage());
241
-        }
242
-    }
199
+public function getAttributes(InputData $xInput): Metadata
200
+{
201
+ContainerAnnotation::$xReader = $this;
202
+$this->aPropTypes = [];
203
+$this->xMetadata = new Metadata();
204
+$sClass = $xInput->getReflectionClass()->getName();
205
+
206
+try
207
+{
208
+// Processing class annotations
209
+$this->sCurrMemberType = AnnotationManager::MEMBER_CLASS;
210
+
211
+$this->readClassAnnotations($sClass);
212
+
213
+// Processing properties annotations
214
+$this->sCurrMemberType = AnnotationManager::MEMBER_PROPERTY;
215
+
216
+// Properties annotations
217
+foreach($xInput->getProperties() as $sProperty)
218
+{
219
+    $this->readPropertyAnnotations($sClass, $sProperty);
220
+}
221
+
222
+// The methods annotations are not taken for excluded classes.
223
+if($this->xMetadata->isExcluded())
224
+{
225
+    return $this->xMetadata;
226
+}
227
+
228
+// Processing methods annotations
229
+$this->sCurrMemberType = AnnotationManager::MEMBER_METHOD;
230
+
231
+foreach($xInput->getMethods() as $sMethod)
232
+{
233
+    $this->readMethodAnnotations($sClass, $sMethod);
234
+}
235
+
236
+return $this->xMetadata;
237
+}
238
+catch(AnnotationException $e)
239
+{
240
+throw new SetupException($e->getMessage());
241
+}
242
+}
243 243
 }
Please login to merge, or discard this patch.
jaxon-upload/tests/src/sample.php 1 patch
Switch Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -4,9 +4,9 @@
 block discarded – undo
4 4
 
5 5
 class SampleUpload
6 6
 {
7
-    public function myMethod()
8
-    {
9
-        $xResponse = jaxon()->getResponse();
10
-        $xResponse->alert('This is a response!!');
11
-    }
7
+public function myMethod()
8
+{
9
+$xResponse = jaxon()->getResponse();
10
+$xResponse->alert('This is a response!!');
11
+}
12 12
 }
Please login to merge, or discard this patch.
jaxon-upload/tests/config/psr.php 1 patch
Switch Indentation   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -1,19 +1,19 @@
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 return [
4
-    'app' => [
5
-    ],
6
-    'lib' => [
7
-        'core' => [
8
-            'debug' => [
9
-                'on' => false,
10
-            ],
11
-            'request' => [
12
-                'uri' => 'ajax.php',
13
-            ],
14
-            'prefix' => [
15
-                'class' => 'Jxn',
16
-            ],
17
-        ],
18
-    ],
4
+'app' => [
5
+],
6
+'lib' => [
7
+'core' => [
8
+'debug' => [
9
+    'on' => false,
10
+],
11
+'request' => [
12
+    'uri' => 'ajax.php',
13
+],
14
+'prefix' => [
15
+    'class' => 'Jxn',
16
+],
17
+],
18
+],
19 19
 ];
Please login to merge, or discard this patch.
jaxon-upload/translations/es/upload.php 1 patch
Switch Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -1,17 +1,17 @@
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 return [
4
-    'errors' => [
5
-        'upload' => [
6
-            'failed' => "El archivo :name no se ha podido subir.",
7
-            'access' => "No se tiene permiso de escritura el directorio de subida.",
8
-            'type' => "Los archivos de tipo :type no están permitidos.",
9
-            'extension' => "Los archivos con la extensión :extension no estan permitidos.",
10
-            'max-size' => "No se pueden subir archivos con peso :size. Muy grande.",
11
-            'min-size' => "No se pueden subir archivos con peso :size. Muy pequeño.",
12
-            'plugin' => "No se ha encontrado el plugin upload.",
13
-            'request' => "No hay datos de subida en la petición.",
14
-            'invalid' => "Los datos de subida no son válidos.",
15
-        ],
16
-    ],
4
+'errors' => [
5
+'upload' => [
6
+'failed' => "El archivo :name no se ha podido subir.",
7
+'access' => "No se tiene permiso de escritura el directorio de subida.",
8
+'type' => "Los archivos de tipo :type no están permitidos.",
9
+'extension' => "Los archivos con la extensión :extension no estan permitidos.",
10
+'max-size' => "No se pueden subir archivos con peso :size. Muy grande.",
11
+'min-size' => "No se pueden subir archivos con peso :size. Muy pequeño.",
12
+'plugin' => "No se ha encontrado el plugin upload.",
13
+'request' => "No hay datos de subida en la petición.",
14
+'invalid' => "Los datos de subida no son válidos.",
15
+],
16
+],
17 17
 ];
Please login to merge, or discard this patch.
jaxon-upload/translations/en/upload.php 1 patch
Switch Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -1,17 +1,17 @@
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 return [
4
-    'errors' => [
5
-        'upload' => [
6
-            'failed' => "The upload of file :name has failed.",
7
-            'access' => "Cannot get write access to upload directory.",
8
-            'type' => "Upload is not allowed for file of type :type.",
9
-            'extension' => "Upload is not allowed for file with extension :extension.",
10
-            'max-size' => "Upload is not allowed for file of size :size. Too big.",
11
-            'min-size' => "Upload is not allowed for file of size :size. Too small.",
12
-            'plugin' => "Upload plugin not found.",
13
-            'request' => "Upload data not available in the request.",
14
-            'invalid' => "Upload data are invalid.",
15
-        ],
16
-    ],
4
+'errors' => [
5
+'upload' => [
6
+'failed' => "The upload of file :name has failed.",
7
+'access' => "Cannot get write access to upload directory.",
8
+'type' => "Upload is not allowed for file of type :type.",
9
+'extension' => "Upload is not allowed for file with extension :extension.",
10
+'max-size' => "Upload is not allowed for file of size :size. Too big.",
11
+'min-size' => "Upload is not allowed for file of size :size. Too small.",
12
+'plugin' => "Upload plugin not found.",
13
+'request' => "Upload data not available in the request.",
14
+'invalid' => "Upload data are invalid.",
15
+],
16
+],
17 17
 ];
Please login to merge, or discard this patch.