Passed
Pull Request — master (#370)
by Valentin
04:51
created
src/Framework/Command/Cycle/Generator/ShowChanges.php 2 patches
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -42,11 +42,11 @@  discard block
 block discarded – undo
42 42
         $this->output->writeln('<info>Detecting schema changes:</info>');
43 43
 
44 44
         $this->changes = [];
45
-        foreach ($registry->getIterator() as $e) {
46
-            if ($registry->hasTable($e)) {
45
+        foreach ($registry->getIterator() as $e){
46
+            if ($registry->hasTable($e)){
47 47
                 $table = $registry->getTableSchema($e);
48 48
 
49
-                if ($table->getComparator()->hasChanges()) {
49
+                if ($table->getComparator()->hasChanges()){
50 50
                     $this->changes[] = [
51 51
                         'database' => $registry->getDatabase($e),
52 52
                         'table'    => $registry->getTable($e),
@@ -56,13 +56,13 @@  discard block
 block discarded – undo
56 56
             }
57 57
         }
58 58
 
59
-        if ($this->changes === []) {
59
+        if ($this->changes === []){
60 60
             $this->output->writeln('<fg=yellow>no database changes has been detected</fg=yellow>');
61 61
 
62 62
             return $registry;
63 63
         }
64 64
 
65
-        foreach ($this->changes as $change) {
65
+        foreach ($this->changes as $change){
66 66
             $this->output->write(sprintf('• <fg=cyan>%s.%s</fg=cyan>', $change['database'], $change['table']));
67 67
             $this->describeChanges($change['schema']);
68 68
         }
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
83 83
      */
84 84
     protected function describeChanges(AbstractTable $table): void
85 85
     {
86
-        if (!$this->output->isVerbose()) {
86
+        if (!$this->output->isVerbose()){
87 87
             $this->output->writeln(
88 88
                 sprintf(
89 89
                     ': <fg=green>%s</fg=green> change(s) detected',
@@ -96,11 +96,11 @@  discard block
 block discarded – undo
96 96
         $this->output->write("\n");
97 97
 
98 98
 
99
-        if (!$table->exists()) {
99
+        if (!$table->exists()){
100 100
             $this->output->writeln('    - create table');
101 101
         }
102 102
 
103
-        if ($table->getStatus() === AbstractTable::STATUS_DECLARED_DROPPED) {
103
+        if ($table->getStatus() === AbstractTable::STATUS_DECLARED_DROPPED){
104 104
             $this->output->writeln('    - drop table');
105 105
             return;
106 106
         }
@@ -117,15 +117,15 @@  discard block
 block discarded – undo
117 117
      */
118 118
     protected function describeColumns(Comparator $cmp): void
119 119
     {
120
-        foreach ($cmp->addedColumns() as $column) {
120
+        foreach ($cmp->addedColumns() as $column){
121 121
             $this->output->writeln("    - add column <fg=yellow>{$column->getName()}</fg=yellow>");
122 122
         }
123 123
 
124
-        foreach ($cmp->droppedColumns() as $column) {
124
+        foreach ($cmp->droppedColumns() as $column){
125 125
             $this->output->writeln("    - drop column <fg=yellow>{$column->getName()}</fg=yellow>");
126 126
         }
127 127
 
128
-        foreach ($cmp->alteredColumns() as $column) {
128
+        foreach ($cmp->alteredColumns() as $column){
129 129
             $column = $column[0];
130 130
             $this->output->writeln("    - alter column <fg=yellow>{$column->getName()}</fg=yellow>");
131 131
         }
@@ -136,17 +136,17 @@  discard block
 block discarded – undo
136 136
      */
137 137
     protected function describeIndexes(Comparator $cmp): void
138 138
     {
139
-        foreach ($cmp->addedIndexes() as $index) {
139
+        foreach ($cmp->addedIndexes() as $index){
140 140
             $index = implode(', ', $index->getColumns());
141 141
             $this->output->writeln("    - add index on <fg=yellow>[{$index}]</fg=yellow>");
142 142
         }
143 143
 
144
-        foreach ($cmp->droppedIndexes() as $index) {
144
+        foreach ($cmp->droppedIndexes() as $index){
145 145
             $index = implode(', ', $index->getColumns());
146 146
             $this->output->writeln("    - drop index on <fg=yellow>[{$index}]</fg=yellow>");
147 147
         }
148 148
 
149
-        foreach ($cmp->alteredIndexes() as $index) {
149
+        foreach ($cmp->alteredIndexes() as $index){
150 150
             $index = $index[0];
151 151
             $index = implode(', ', $index->getColumns());
152 152
             $this->output->writeln("    - alter index on <fg=yellow>[{$index}]</fg=yellow>");
@@ -158,17 +158,17 @@  discard block
 block discarded – undo
158 158
      */
159 159
     protected function describeFKs(Comparator $cmp): void
160 160
     {
161
-        foreach ($cmp->addedForeignKeys() as $fk) {
161
+        foreach ($cmp->addedForeignKeys() as $fk){
162 162
             $fkColumns = implode(', ', $fk->getColumns());
163 163
             $this->output->writeln("    - add foreign key on <fg=yellow>{$fkColumns}</fg=yellow>");
164 164
         }
165 165
 
166
-        foreach ($cmp->droppedForeignKeys() as $fk) {
166
+        foreach ($cmp->droppedForeignKeys() as $fk){
167 167
             $fkColumns = implode(', ', $fk->getColumns());
168 168
             $this->output->writeln("    - drop foreign key <fg=yellow>{$fkColumns}</fg=yellow>");
169 169
         }
170 170
 
171
-        foreach ($cmp->alteredForeignKeys() as $fk) {
171
+        foreach ($cmp->alteredForeignKeys() as $fk){
172 172
             $fk = $fk[0];
173 173
             $fkColumns = implode(', ', $fk->getColumns());
174 174
             $this->output->writeln("    - alter foreign key <fg=yellow>{$fkColumns}</fg=yellow>");
Please login to merge, or discard this patch.
Braces   +34 added lines, -17 removed lines patch added patch discarded remove patch
@@ -42,11 +42,14 @@  discard block
 block discarded – undo
42 42
         $this->output->writeln('<info>Detecting schema changes:</info>');
43 43
 
44 44
         $this->changes = [];
45
-        foreach ($registry->getIterator() as $e) {
46
-            if ($registry->hasTable($e)) {
45
+        foreach ($registry->getIterator() as $e)
46
+        {
47
+            if ($registry->hasTable($e))
48
+            {
47 49
                 $table = $registry->getTableSchema($e);
48 50
 
49
-                if ($table->getComparator()->hasChanges()) {
51
+                if ($table->getComparator()->hasChanges())
52
+                {
50 53
                     $this->changes[] = [
51 54
                         'database' => $registry->getDatabase($e),
52 55
                         'table'    => $registry->getTable($e),
@@ -56,13 +59,15 @@  discard block
 block discarded – undo
56 59
             }
57 60
         }
58 61
 
59
-        if ($this->changes === []) {
62
+        if ($this->changes === [])
63
+        {
60 64
             $this->output->writeln('<fg=yellow>no database changes has been detected</fg=yellow>');
61 65
 
62 66
             return $registry;
63 67
         }
64 68
 
65
-        foreach ($this->changes as $change) {
69
+        foreach ($this->changes as $change)
70
+        {
66 71
             $this->output->write(sprintf('• <fg=cyan>%s.%s</fg=cyan>', $change['database'], $change['table']));
67 72
             $this->describeChanges($change['schema']);
68 73
         }
@@ -83,7 +88,8 @@  discard block
 block discarded – undo
83 88
      */
84 89
     protected function describeChanges(AbstractTable $table): void
85 90
     {
86
-        if (!$this->output->isVerbose()) {
91
+        if (!$this->output->isVerbose())
92
+        {
87 93
             $this->output->writeln(
88 94
                 sprintf(
89 95
                     ': <fg=green>%s</fg=green> change(s) detected',
@@ -96,11 +102,13 @@  discard block
 block discarded – undo
96 102
         $this->output->write("\n");
97 103
 
98 104
 
99
-        if (!$table->exists()) {
105
+        if (!$table->exists())
106
+        {
100 107
             $this->output->writeln('    - create table');
101 108
         }
102 109
 
103
-        if ($table->getStatus() === AbstractTable::STATUS_DECLARED_DROPPED) {
110
+        if ($table->getStatus() === AbstractTable::STATUS_DECLARED_DROPPED)
111
+        {
104 112
             $this->output->writeln('    - drop table');
105 113
             return;
106 114
         }
@@ -117,15 +125,18 @@  discard block
 block discarded – undo
117 125
      */
118 126
     protected function describeColumns(Comparator $cmp): void
119 127
     {
120
-        foreach ($cmp->addedColumns() as $column) {
128
+        foreach ($cmp->addedColumns() as $column)
129
+        {
121 130
             $this->output->writeln("    - add column <fg=yellow>{$column->getName()}</fg=yellow>");
122 131
         }
123 132
 
124
-        foreach ($cmp->droppedColumns() as $column) {
133
+        foreach ($cmp->droppedColumns() as $column)
134
+        {
125 135
             $this->output->writeln("    - drop column <fg=yellow>{$column->getName()}</fg=yellow>");
126 136
         }
127 137
 
128
-        foreach ($cmp->alteredColumns() as $column) {
138
+        foreach ($cmp->alteredColumns() as $column)
139
+        {
129 140
             $column = $column[0];
130 141
             $this->output->writeln("    - alter column <fg=yellow>{$column->getName()}</fg=yellow>");
131 142
         }
@@ -136,17 +147,20 @@  discard block
 block discarded – undo
136 147
      */
137 148
     protected function describeIndexes(Comparator $cmp): void
138 149
     {
139
-        foreach ($cmp->addedIndexes() as $index) {
150
+        foreach ($cmp->addedIndexes() as $index)
151
+        {
140 152
             $index = implode(', ', $index->getColumns());
141 153
             $this->output->writeln("    - add index on <fg=yellow>[{$index}]</fg=yellow>");
142 154
         }
143 155
 
144
-        foreach ($cmp->droppedIndexes() as $index) {
156
+        foreach ($cmp->droppedIndexes() as $index)
157
+        {
145 158
             $index = implode(', ', $index->getColumns());
146 159
             $this->output->writeln("    - drop index on <fg=yellow>[{$index}]</fg=yellow>");
147 160
         }
148 161
 
149
-        foreach ($cmp->alteredIndexes() as $index) {
162
+        foreach ($cmp->alteredIndexes() as $index)
163
+        {
150 164
             $index = $index[0];
151 165
             $index = implode(', ', $index->getColumns());
152 166
             $this->output->writeln("    - alter index on <fg=yellow>[{$index}]</fg=yellow>");
@@ -158,17 +172,20 @@  discard block
 block discarded – undo
158 172
      */
159 173
     protected function describeFKs(Comparator $cmp): void
160 174
     {
161
-        foreach ($cmp->addedForeignKeys() as $fk) {
175
+        foreach ($cmp->addedForeignKeys() as $fk)
176
+        {
162 177
             $fkColumns = implode(', ', $fk->getColumns());
163 178
             $this->output->writeln("    - add foreign key on <fg=yellow>{$fkColumns}</fg=yellow>");
164 179
         }
165 180
 
166
-        foreach ($cmp->droppedForeignKeys() as $fk) {
181
+        foreach ($cmp->droppedForeignKeys() as $fk)
182
+        {
167 183
             $fkColumns = implode(', ', $fk->getColumns());
168 184
             $this->output->writeln("    - drop foreign key <fg=yellow>{$fkColumns}</fg=yellow>");
169 185
         }
170 186
 
171
-        foreach ($cmp->alteredForeignKeys() as $fk) {
187
+        foreach ($cmp->alteredForeignKeys() as $fk)
188
+        {
172 189
             $fk = $fk[0];
173 190
             $fkColumns = implode(', ', $fk->getColumns());
174 191
             $this->output->writeln("    - alter foreign key <fg=yellow>{$fkColumns}</fg=yellow>");
Please login to merge, or discard this patch.
src/Framework/Command/Translator/ExportCommand.php 2 patches
Braces   +12 added lines, -6 removed lines patch added patch discarded remove patch
@@ -39,7 +39,8 @@  discard block
 block discarded – undo
39 39
      */
40 40
     public function perform(TranslatorConfig $config, CatalogueManager $manager): void
41 41
     {
42
-        if (!$config->hasDumper($this->option('dumper'))) {
42
+        if (!$config->hasDumper($this->option('dumper')))
43
+        {
43 44
             $this->writeln("<fg=red>Undefined dumper '{$this->option('dumper')}'.</fg=red>");
44 45
 
45 46
             return;
@@ -51,7 +52,8 @@  discard block
 block discarded – undo
51 52
             $manager->get($this->argument('locale'))
52 53
         );
53 54
 
54
-        if ($this->isVerbose() && !empty($mc->getDomains())) {
55
+        if ($this->isVerbose() && !empty($mc->getDomains()))
56
+        {
55 57
             $this->sprintf(
56 58
                 "<info>Exporting domain(s):</info> %s\n",
57 59
                 implode(',', $mc->getDomains())
@@ -89,10 +91,14 @@  discard block
 block discarded – undo
89 91
             $catalogue->getData()
90 92
         );
91 93
 
92
-        if ($this->option('fallback')) {
93
-            foreach ($manager->get($config->getFallbackLocale())->getData() as $domain => $messages) {
94
-                foreach ($messages as $id => $message) {
95
-                    if (!$messageCatalogue->defines($id, $domain)) {
94
+        if ($this->option('fallback'))
95
+        {
96
+            foreach ($manager->get($config->getFallbackLocale())->getData() as $domain => $messages)
97
+            {
98
+                foreach ($messages as $id => $message)
99
+                {
100
+                    if (!$messageCatalogue->defines($id, $domain))
101
+                    {
96 102
                         $messageCatalogue->set($id, $message, $domain);
97 103
                     }
98 104
                 }
Please login to merge, or discard this patch.
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
         ['locale', InputArgument::REQUIRED, 'Locale to be dumped'],
29 29
         ['path', InputArgument::REQUIRED, 'Export path'],
30 30
     ];
31
-    protected const OPTIONS     = [
31
+    protected const OPTIONS = [
32 32
         ['dumper', 'd', InputOption::VALUE_OPTIONAL, 'Dumper name', 'php'],
33 33
         ['fallback', 'f', InputOption::VALUE_NONE, 'Merge messages from fallback catalogue'],
34 34
     ];
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
      */
40 40
     public function perform(TranslatorConfig $config, CatalogueManager $manager): void
41 41
     {
42
-        if (!$config->hasDumper($this->option('dumper'))) {
42
+        if (!$config->hasDumper($this->option('dumper'))){
43 43
             $this->writeln("<fg=red>Undefined dumper '{$this->option('dumper')}'.</fg=red>");
44 44
 
45 45
             return;
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
             $manager->get($this->argument('locale'))
52 52
         );
53 53
 
54
-        if ($this->isVerbose() && !empty($mc->getDomains())) {
54
+        if ($this->isVerbose() && !empty($mc->getDomains())){
55 55
             $this->sprintf(
56 56
                 "<info>Exporting domain(s):</info> %s\n",
57 57
                 implode(',', $mc->getDomains())
@@ -69,8 +69,8 @@  discard block
 block discarded – undo
69 69
             ]
70 70
         );
71 71
 
72
-        $this->writeln('Export successfully completed using <info>' . get_class($dumper) . '</info>');
73
-        $this->writeln('Output: <comment>' . realpath($this->argument('path')) . '</comment>');
72
+        $this->writeln('Export successfully completed using <info>'.get_class($dumper).'</info>');
73
+        $this->writeln('Output: <comment>'.realpath($this->argument('path')).'</comment>');
74 74
     }
75 75
 
76 76
     /**
@@ -89,10 +89,10 @@  discard block
 block discarded – undo
89 89
             $catalogue->getData()
90 90
         );
91 91
 
92
-        if ($this->option('fallback')) {
93
-            foreach ($manager->get($config->getFallbackLocale())->getData() as $domain => $messages) {
94
-                foreach ($messages as $id => $message) {
95
-                    if (!$messageCatalogue->defines($id, $domain)) {
92
+        if ($this->option('fallback')){
93
+            foreach ($manager->get($config->getFallbackLocale())->getData() as $domain => $messages){
94
+                foreach ($messages as $id => $message){
95
+                    if (!$messageCatalogue->defines($id, $domain)){
96 96
                         $messageCatalogue->set($id, $message, $domain);
97 97
                     }
98 98
                 }
Please login to merge, or discard this patch.
src/Csrf/tests/TestResponseFactory.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@
 block discarded – undo
37 37
         $response = new Response('php://memory', $code, []);
38 38
         $response = $response->withStatus($code, $reasonPhrase);
39 39
 
40
-        foreach ($this->config->getBaseHeaders() as $header => $value) {
40
+        foreach ($this->config->getBaseHeaders() as $header => $value){
41 41
             $response = $response->withAddedHeader($header, $value);
42 42
         }
43 43
 
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -37,7 +37,8 @@
 block discarded – undo
37 37
         $response = new Response('php://memory', $code, []);
38 38
         $response = $response->withStatus($code, $reasonPhrase);
39 39
 
40
-        foreach ($this->config->getBaseHeaders() as $header => $value) {
40
+        foreach ($this->config->getBaseHeaders() as $header => $value)
41
+        {
41 42
             $response = $response->withAddedHeader($header, $value);
42 43
         }
43 44
 
Please login to merge, or discard this patch.
src/Csrf/tests/CsrfTest.php 2 patches
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
     {
53 53
         $core = $this->httpCore([CsrfMiddleware::class]);
54 54
         $core->setHandler(
55
-            static function ($r) {
55
+            static function ($r){
56 56
                 return $r->getAttribute(CsrfMiddleware::ATTRIBUTE);
57 57
             }
58 58
         );
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
 
83 83
         $core = $this->httpCore([CsrfMiddleware::class]);
84 84
         $core->setHandler(
85
-            static function () {
85
+            static function (){
86 86
                 return 'all good';
87 87
             }
88 88
         );
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
     {
95 95
         $core = $this->httpCore([CsrfMiddleware::class, CsrfFirewall::class]);
96 96
         $core->setHandler(
97
-            static function () {
97
+            static function (){
98 98
                 return 'all good';
99 99
             }
100 100
         );
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
         $this->expectException(\LogicException::class);
109 109
         $core = $this->httpCore([CsrfFirewall::class]);
110 110
         $core->setHandler(
111
-            static function () {
111
+            static function (){
112 112
                 return 'all good';
113 113
             }
114 114
         );
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
     {
121 121
         $core = $this->httpCore([CsrfMiddleware::class, CsrfFirewall::class]);
122 122
         $core->setHandler(
123
-            static function () {
123
+            static function (){
124 124
                 return 'all good';
125 125
             }
126 126
         );
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
     {
154 154
         $core = $this->httpCore([CsrfMiddleware::class, CsrfFirewall::class]);
155 155
         $core->setHandler(
156
-            static function () {
156
+            static function (){
157 157
                 return 'all good';
158 158
             }
159 159
         );
@@ -186,7 +186,7 @@  discard block
 block discarded – undo
186 186
     {
187 187
         $core = $this->httpCore([CsrfMiddleware::class, StrictCsrfFirewall::class]);
188 188
         $core->setHandler(
189
-            static function () {
189
+            static function (){
190 190
                 return 'all good';
191 191
             }
192 192
         );
@@ -277,10 +277,10 @@  discard block
 block discarded – undo
277 277
     {
278 278
         $result = [];
279 279
 
280
-        foreach ($response->getHeaders() as $header) {
281
-            foreach ($header as $headerLine) {
280
+        foreach ($response->getHeaders() as $header){
281
+            foreach ($header as $headerLine){
282 282
                 $chunk = explode(';', $headerLine);
283
-                if (!count($chunk) || mb_strpos($chunk[0], '=') === false) {
283
+                if (!count($chunk) || mb_strpos($chunk[0], '=') === false){
284 284
                     continue;
285 285
                 }
286 286
 
Please login to merge, or discard this patch.
Braces   +20 added lines, -10 removed lines patch added patch discarded remove patch
@@ -52,7 +52,8 @@  discard block
 block discarded – undo
52 52
     {
53 53
         $core = $this->httpCore([CsrfMiddleware::class]);
54 54
         $core->setHandler(
55
-            static function ($r) {
55
+            static function ($r)
56
+            {
56 57
                 return $r->getAttribute(CsrfMiddleware::ATTRIBUTE);
57 58
             }
58 59
         );
@@ -82,7 +83,8 @@  discard block
 block discarded – undo
82 83
 
83 84
         $core = $this->httpCore([CsrfMiddleware::class]);
84 85
         $core->setHandler(
85
-            static function () {
86
+            static function ()
87
+            {
86 88
                 return 'all good';
87 89
             }
88 90
         );
@@ -94,7 +96,8 @@  discard block
 block discarded – undo
94 96
     {
95 97
         $core = $this->httpCore([CsrfMiddleware::class, CsrfFirewall::class]);
96 98
         $core->setHandler(
97
-            static function () {
99
+            static function ()
100
+            {
98 101
                 return 'all good';
99 102
             }
100 103
         );
@@ -108,7 +111,8 @@  discard block
 block discarded – undo
108 111
         $this->expectException(\LogicException::class);
109 112
         $core = $this->httpCore([CsrfFirewall::class]);
110 113
         $core->setHandler(
111
-            static function () {
114
+            static function ()
115
+            {
112 116
                 return 'all good';
113 117
             }
114 118
         );
@@ -120,7 +124,8 @@  discard block
 block discarded – undo
120 124
     {
121 125
         $core = $this->httpCore([CsrfMiddleware::class, CsrfFirewall::class]);
122 126
         $core->setHandler(
123
-            static function () {
127
+            static function ()
128
+            {
124 129
                 return 'all good';
125 130
             }
126 131
         );
@@ -153,7 +158,8 @@  discard block
 block discarded – undo
153 158
     {
154 159
         $core = $this->httpCore([CsrfMiddleware::class, CsrfFirewall::class]);
155 160
         $core->setHandler(
156
-            static function () {
161
+            static function ()
162
+            {
157 163
                 return 'all good';
158 164
             }
159 165
         );
@@ -186,7 +192,8 @@  discard block
 block discarded – undo
186 192
     {
187 193
         $core = $this->httpCore([CsrfMiddleware::class, StrictCsrfFirewall::class]);
188 194
         $core->setHandler(
189
-            static function () {
195
+            static function ()
196
+            {
190 197
                 return 'all good';
191 198
             }
192 199
         );
@@ -277,10 +284,13 @@  discard block
 block discarded – undo
277 284
     {
278 285
         $result = [];
279 286
 
280
-        foreach ($response->getHeaders() as $header) {
281
-            foreach ($header as $headerLine) {
287
+        foreach ($response->getHeaders() as $header)
288
+        {
289
+            foreach ($header as $headerLine)
290
+            {
282 291
                 $chunk = explode(';', $headerLine);
283
-                if (!count($chunk) || mb_strpos($chunk[0], '=') === false) {
292
+                if (!count($chunk) || mb_strpos($chunk[0], '=') === false)
293
+                {
284 294
                     continue;
285 295
                 }
286 296
 
Please login to merge, or discard this patch.
src/Csrf/src/Middleware/CsrfMiddleware.php 2 patches
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -46,9 +46,9 @@  discard block
 block discarded – undo
46 46
      */
47 47
     public function process(Request $request, RequestHandlerInterface $handler): Response
48 48
     {
49
-        if (isset($request->getCookieParams()[$this->config->getCookie()])) {
49
+        if (isset($request->getCookieParams()[$this->config->getCookie()])){
50 50
             $token = $request->getCookieParams()[$this->config->getCookie()];
51
-        } else {
51
+        }else{
52 52
             //Making new token
53 53
             $token = $this->random($this->config->getTokenLength());
54 54
 
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
         //CSRF issues must be handled by Firewall middleware
60 60
         $response = $handler->handle($request->withAttribute(static::ATTRIBUTE, $token));
61 61
 
62
-        if (!empty($cookie)) {
62
+        if (!empty($cookie)){
63 63
             return $response->withAddedHeader('Set-Cookie', $cookie);
64 64
         }
65 65
 
@@ -94,11 +94,11 @@  discard block
 block discarded – undo
94 94
      */
95 95
     private function random(int $length = 32): string
96 96
     {
97
-        try {
98
-            if (empty($string = random_bytes($length))) {
97
+        try{
98
+            if (empty($string = random_bytes($length))){
99 99
                 throw new \RuntimeException('Unable to generate random string');
100 100
             }
101
-        } catch (\Throwable $e) {
101
+        }catch (\Throwable $e){
102 102
             throw new \RuntimeException('Unable to generate random string', $e->getCode(), $e);
103 103
         }
104 104
 
Please login to merge, or discard this patch.
Braces   +14 added lines, -6 removed lines patch added patch discarded remove patch
@@ -46,9 +46,12 @@  discard block
 block discarded – undo
46 46
      */
47 47
     public function process(Request $request, RequestHandlerInterface $handler): Response
48 48
     {
49
-        if (isset($request->getCookieParams()[$this->config->getCookie()])) {
49
+        if (isset($request->getCookieParams()[$this->config->getCookie()]))
50
+        {
50 51
             $token = $request->getCookieParams()[$this->config->getCookie()];
51
-        } else {
52
+        }
53
+        else
54
+        {
52 55
             //Making new token
53 56
             $token = $this->random($this->config->getTokenLength());
54 57
 
@@ -59,7 +62,8 @@  discard block
 block discarded – undo
59 62
         //CSRF issues must be handled by Firewall middleware
60 63
         $response = $handler->handle($request->withAttribute(static::ATTRIBUTE, $token));
61 64
 
62
-        if (!empty($cookie)) {
65
+        if (!empty($cookie))
66
+        {
63 67
             return $response->withAddedHeader('Set-Cookie', $cookie);
64 68
         }
65 69
 
@@ -94,11 +98,15 @@  discard block
 block discarded – undo
94 98
      */
95 99
     private function random(int $length = 32): string
96 100
     {
97
-        try {
98
-            if (empty($string = random_bytes($length))) {
101
+        try
102
+        {
103
+            if (empty($string = random_bytes($length)))
104
+            {
99 105
                 throw new \RuntimeException('Unable to generate random string');
100 106
             }
101
-        } catch (\Throwable $e) {
107
+        }
108
+        catch (\Throwable $e)
109
+        {
102 110
             throw new \RuntimeException('Unable to generate random string', $e->getCode(), $e);
103 111
         }
104 112
 
Please login to merge, or discard this patch.
src/Csrf/src/Middleware/CsrfFirewall.php 2 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -61,11 +61,11 @@  discard block
 block discarded – undo
61 61
     {
62 62
         $token = $request->getAttribute(CsrfMiddleware::ATTRIBUTE);
63 63
 
64
-        if (empty($token)) {
64
+        if (empty($token)){
65 65
             throw new \LogicException('Unable to apply CSRF firewall, attribute is missing');
66 66
         }
67 67
 
68
-        if ($this->isRequired($request) && !hash_equals($token, $this->fetchToken($request))) {
68
+        if ($this->isRequired($request) && !hash_equals($token, $this->fetchToken($request))){
69 69
             return $this->responseFactory->createResponse(412, 'Bad CSRF Token');
70 70
         }
71 71
 
@@ -91,12 +91,12 @@  discard block
 block discarded – undo
91 91
      */
92 92
     protected function fetchToken(Request $request): string
93 93
     {
94
-        if ($request->hasHeader(self::HEADER)) {
94
+        if ($request->hasHeader(self::HEADER)){
95 95
             return (string)$request->getHeaderLine(self::HEADER);
96 96
         }
97 97
 
98 98
         $data = $request->getParsedBody();
99
-        if (is_array($data) && isset($data[self::PARAMETER]) && is_string($data[self::PARAMETER])) {
99
+        if (is_array($data) && isset($data[self::PARAMETER]) && is_string($data[self::PARAMETER])){
100 100
             return $data[self::PARAMETER];
101 101
         }
102 102
 
Please login to merge, or discard this patch.
Braces   +8 added lines, -4 removed lines patch added patch discarded remove patch
@@ -61,11 +61,13 @@  discard block
 block discarded – undo
61 61
     {
62 62
         $token = $request->getAttribute(CsrfMiddleware::ATTRIBUTE);
63 63
 
64
-        if (empty($token)) {
64
+        if (empty($token))
65
+        {
65 66
             throw new \LogicException('Unable to apply CSRF firewall, attribute is missing');
66 67
         }
67 68
 
68
-        if ($this->isRequired($request) && !hash_equals($token, $this->fetchToken($request))) {
69
+        if ($this->isRequired($request) && !hash_equals($token, $this->fetchToken($request)))
70
+        {
69 71
             return $this->responseFactory->createResponse(412, 'Bad CSRF Token');
70 72
         }
71 73
 
@@ -91,12 +93,14 @@  discard block
 block discarded – undo
91 93
      */
92 94
     protected function fetchToken(Request $request): string
93 95
     {
94
-        if ($request->hasHeader(self::HEADER)) {
96
+        if ($request->hasHeader(self::HEADER))
97
+        {
95 98
             return (string)$request->getHeaderLine(self::HEADER);
96 99
         }
97 100
 
98 101
         $data = $request->getParsedBody();
99
-        if (is_array($data) && isset($data[self::PARAMETER]) && is_string($data[self::PARAMETER])) {
102
+        if (is_array($data) && isset($data[self::PARAMETER]) && is_string($data[self::PARAMETER]))
103
+        {
100 104
             return $data[self::PARAMETER];
101 105
         }
102 106
 
Please login to merge, or discard this patch.
src/AuthHttp/src/Transport/CookieTransport.php 2 patches
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
         bool $secure = false,
57 57
         bool $httpOnly = true,
58 58
         ?string $sameSite = null
59
-    ) {
59
+    ){
60 60
         $this->cookie = $cookie;
61 61
         $this->basePath = $basePath;
62 62
         $this->domain = $domain;
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
     ): Response {
86 86
         /** @var CookieQueue $cookieQueue */
87 87
         $cookieQueue = $request->getAttribute(CookieQueue::ATTRIBUTE);
88
-        if ($cookieQueue === null) {
88
+        if ($cookieQueue === null){
89 89
             return $response->withAddedHeader(
90 90
                 'Set-Cookie',
91 91
                 Cookie::create(
@@ -101,9 +101,9 @@  discard block
 block discarded – undo
101 101
             );
102 102
         }
103 103
 
104
-        if ($tokenID === null) {
104
+        if ($tokenID === null){
105 105
             $cookieQueue->delete($this->cookie);
106
-        } else {
106
+        }else{
107 107
             $cookieQueue->set(
108 108
                 $this->cookie,
109 109
                 $tokenID,
@@ -134,7 +134,7 @@  discard block
 block discarded – undo
134 134
      */
135 135
     private function getLifetime(\DateTimeInterface $expiresAt = null): ?int
136 136
     {
137
-        if ($expiresAt === null) {
137
+        if ($expiresAt === null){
138 138
             return null;
139 139
         }
140 140
 
Please login to merge, or discard this patch.
Braces   +9 added lines, -4 removed lines patch added patch discarded remove patch
@@ -85,7 +85,8 @@  discard block
 block discarded – undo
85 85
     ): Response {
86 86
         /** @var CookieQueue $cookieQueue */
87 87
         $cookieQueue = $request->getAttribute(CookieQueue::ATTRIBUTE);
88
-        if ($cookieQueue === null) {
88
+        if ($cookieQueue === null)
89
+        {
89 90
             return $response->withAddedHeader(
90 91
                 'Set-Cookie',
91 92
                 Cookie::create(
@@ -101,9 +102,12 @@  discard block
 block discarded – undo
101 102
             );
102 103
         }
103 104
 
104
-        if ($tokenID === null) {
105
+        if ($tokenID === null)
106
+        {
105 107
             $cookieQueue->delete($this->cookie);
106
-        } else {
108
+        }
109
+        else
110
+        {
107 111
             $cookieQueue->set(
108 112
                 $this->cookie,
109 113
                 $tokenID,
@@ -134,7 +138,8 @@  discard block
 block discarded – undo
134 138
      */
135 139
     private function getLifetime(\DateTimeInterface $expiresAt = null): ?int
136 140
     {
137
-        if ($expiresAt === null) {
141
+        if ($expiresAt === null)
142
+        {
138 143
             return null;
139 144
         }
140 145
 
Please login to merge, or discard this patch.
src/AuthHttp/src/Transport/HeaderTransport.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
      */
37 37
     public function fetchToken(Request $request): ?string
38 38
     {
39
-        if ($request->hasHeader($this->header)) {
39
+        if ($request->hasHeader($this->header)){
40 40
             return $request->getHeaderLine($this->header);
41 41
         }
42 42
 
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
         string $tokenID,
53 53
         \DateTimeInterface $expiresAt = null
54 54
     ): Response {
55
-        if ($request->hasHeader($this->header) && $request->getHeaderLine($this->header) === $tokenID) {
55
+        if ($request->hasHeader($this->header) && $request->getHeaderLine($this->header) === $tokenID){
56 56
             return $response;
57 57
         }
58 58
 
Please login to merge, or discard this patch.
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -36,7 +36,8 @@  discard block
 block discarded – undo
36 36
      */
37 37
     public function fetchToken(Request $request): ?string
38 38
     {
39
-        if ($request->hasHeader($this->header)) {
39
+        if ($request->hasHeader($this->header))
40
+        {
40 41
             return $request->getHeaderLine($this->header);
41 42
         }
42 43
 
@@ -52,7 +53,8 @@  discard block
 block discarded – undo
52 53
         string $tokenID,
53 54
         \DateTimeInterface $expiresAt = null
54 55
     ): Response {
55
-        if ($request->hasHeader($this->header) && $request->getHeaderLine($this->header) === $tokenID) {
56
+        if ($request->hasHeader($this->header) && $request->getHeaderLine($this->header) === $tokenID)
57
+        {
56 58
             return $response;
57 59
         }
58 60
 
Please login to merge, or discard this patch.
src/AuthHttp/src/Middleware/AuthMiddleware.php 2 patches
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
         ActorProviderInterface $actorProvider,
55 55
         TokenStorageInterface $tokenStorage,
56 56
         TransportRegistry $transportRegistry
57
-    ) {
57
+    ){
58 58
         $this->scope = $scope;
59 59
         $this->actorProvider = $actorProvider;
60 60
         $this->tokenStorage = $tokenStorage;
@@ -89,14 +89,14 @@  discard block
 block discarded – undo
89 89
      */
90 90
     private function initContext(Request $request, AuthContextInterface $authContext): AuthContextInterface
91 91
     {
92
-        foreach ($this->transportRegistry->getTransports() as $name => $transport) {
92
+        foreach ($this->transportRegistry->getTransports() as $name => $transport){
93 93
             $tokenID = $transport->fetchToken($request);
94
-            if ($tokenID === null) {
94
+            if ($tokenID === null){
95 95
                 continue;
96 96
             }
97 97
 
98 98
             $token = $this->tokenStorage->load($tokenID);
99
-            if ($token === null) {
99
+            if ($token === null){
100 100
                 continue;
101 101
             }
102 102
 
@@ -116,13 +116,13 @@  discard block
 block discarded – undo
116 116
      */
117 117
     private function closeContext(Request $request, Response $response, AuthContextInterface $authContext): Response
118 118
     {
119
-        if ($authContext->getToken() === null) {
119
+        if ($authContext->getToken() === null){
120 120
             return $response;
121 121
         }
122 122
 
123 123
         $transport = $this->transportRegistry->getTransport($authContext->getTransport());
124 124
 
125
-        if ($authContext->isClosed()) {
125
+        if ($authContext->isClosed()){
126 126
             $this->tokenStorage->delete($authContext->getToken());
127 127
 
128 128
             return $transport->removeToken(
Please login to merge, or discard this patch.
Braces   +12 added lines, -6 removed lines patch added patch discarded remove patch
@@ -74,7 +74,8 @@  discard block
 block discarded – undo
74 74
 
75 75
         $response = $this->scope->runScope(
76 76
             [AuthContextInterface::class => $authContext],
77
-            static function () use ($request, $handler, $authContext) {
77
+            static function () use ($request, $handler, $authContext)
78
+            {
78 79
                 return $handler->handle($request->withAttribute(self::ATTRIBUTE, $authContext));
79 80
             }
80 81
         );
@@ -89,14 +90,17 @@  discard block
 block discarded – undo
89 90
      */
90 91
     private function initContext(Request $request, AuthContextInterface $authContext): AuthContextInterface
91 92
     {
92
-        foreach ($this->transportRegistry->getTransports() as $name => $transport) {
93
+        foreach ($this->transportRegistry->getTransports() as $name => $transport)
94
+        {
93 95
             $tokenID = $transport->fetchToken($request);
94
-            if ($tokenID === null) {
96
+            if ($tokenID === null)
97
+            {
95 98
                 continue;
96 99
             }
97 100
 
98 101
             $token = $this->tokenStorage->load($tokenID);
99
-            if ($token === null) {
102
+            if ($token === null)
103
+            {
100 104
                 continue;
101 105
             }
102 106
 
@@ -116,13 +120,15 @@  discard block
 block discarded – undo
116 120
      */
117 121
     private function closeContext(Request $request, Response $response, AuthContextInterface $authContext): Response
118 122
     {
119
-        if ($authContext->getToken() === null) {
123
+        if ($authContext->getToken() === null)
124
+        {
120 125
             return $response;
121 126
         }
122 127
 
123 128
         $transport = $this->transportRegistry->getTransport($authContext->getTransport());
124 129
 
125
-        if ($authContext->isClosed()) {
130
+        if ($authContext->isClosed())
131
+        {
126 132
             $this->tokenStorage->delete($authContext->getToken());
127 133
 
128 134
             return $transport->removeToken(
Please login to merge, or discard this patch.