@@ -280,12 +280,10 @@ discard block |
||
280 | 280 | { |
281 | 281 | $context->setUserId( $GLOBALS['TSFE']->fe_user->user[$GLOBALS['TSFE']->fe_user->userid_column] ); |
282 | 282 | $context->setEditor( (string) $GLOBALS['TSFE']->fe_user->user['username'] ); |
283 | - } |
|
284 | - elseif( TYPO3_MODE === 'BE' && isset( $GLOBALS['BE_USER']->user['username'] ) ) |
|
283 | + } elseif( TYPO3_MODE === 'BE' && isset( $GLOBALS['BE_USER']->user['username'] ) ) |
|
285 | 284 | { |
286 | 285 | $context->setEditor( (string) $GLOBALS['BE_USER']->user['username'] ); |
287 | - } |
|
288 | - else |
|
286 | + } else |
|
289 | 287 | { |
290 | 288 | $context->setEditor( (string) GeneralUtility::getIndpEnv( 'REMOTE_ADDR' ) ); |
291 | 289 | } |
@@ -312,8 +310,7 @@ discard block |
||
312 | 310 | { |
313 | 311 | $ids = GeneralUtility::trimExplode( ',', $GLOBALS['TSFE']->fe_user->user['usergroup'] ); |
314 | 312 | $context->setGroupIds( $ids ); |
315 | - } |
|
316 | - elseif( TYPO3_MODE === 'BE' && $GLOBALS['BE_USER']->userGroups ) |
|
313 | + } elseif( TYPO3_MODE === 'BE' && $GLOBALS['BE_USER']->userGroups ) |
|
317 | 314 | { |
318 | 315 | $ids = array_keys( $GLOBALS['BE_USER']->userGroups ); |
319 | 316 | $context->setGroupIds( $ids ); |
@@ -37,9 +37,12 @@ discard block |
||
37 | 37 | */ |
38 | 38 | public function getAdditionalFields( array &$taskInfo, $task, \TYPO3\CMS\Scheduler\Controller\SchedulerModuleController $parentObject ) |
39 | 39 | { |
40 | - try { |
|
40 | + try |
|
41 | + { |
|
41 | 42 | return $this->getFields( $taskInfo, $task, $parentObject ); |
42 | - } catch( \Exception $e ) { |
|
43 | + } |
|
44 | + catch( \Exception $e ) |
|
45 | + { |
|
43 | 46 | $this->addMessage( $e->getMessage(), \TYPO3\CMS\Core\Messaging\AbstractMessage::ERROR ); |
44 | 47 | } |
45 | 48 | |
@@ -72,9 +75,12 @@ discard block |
||
72 | 75 | */ |
73 | 76 | public function validateAdditionalFields( array &$submittedData, \TYPO3\CMS\Scheduler\Controller\SchedulerModuleController $parentObject ) |
74 | 77 | { |
75 | - try { |
|
78 | + try |
|
79 | + { |
|
76 | 80 | return $this->validateFields( $submittedData, $parentObject ); |
77 | - } catch( \Exception $e ) { |
|
81 | + } |
|
82 | + catch( \Exception $e ) |
|
83 | + { |
|
78 | 84 | $this->addMessage( $e->getMessage(), \TYPO3\CMS\Core\Messaging\AbstractMessage::ERROR ); |
79 | 85 | } |
80 | 86 |
@@ -37,9 +37,12 @@ discard block |
||
37 | 37 | */ |
38 | 38 | public function getAdditionalFields( array &$taskInfo, $task, \TYPO3\CMS\Scheduler\Controller\SchedulerModuleController $parentObject ) |
39 | 39 | { |
40 | - try { |
|
40 | + try |
|
41 | + { |
|
41 | 42 | return $this->getFields( $taskInfo, $task, $parentObject ); |
42 | - } catch( \Exception $e ) { |
|
43 | + } |
|
44 | + catch( \Exception $e ) |
|
45 | + { |
|
43 | 46 | $this->addMessage( $e->getMessage(), \TYPO3\CMS\Core\Messaging\AbstractMessage::ERROR ); |
44 | 47 | } |
45 | 48 | |
@@ -72,9 +75,12 @@ discard block |
||
72 | 75 | */ |
73 | 76 | public function validateAdditionalFields( array &$submittedData, \TYPO3\CMS\Scheduler\Controller\SchedulerModuleController $parentObject ) |
74 | 77 | { |
75 | - try { |
|
78 | + try |
|
79 | + { |
|
76 | 80 | return $this->validateFields( $submittedData, $parentObject ); |
77 | - } catch( \Exception $e ) { |
|
81 | + } |
|
82 | + catch( \Exception $e ) |
|
83 | + { |
|
78 | 84 | $this->addMessage( $e->getMessage(), \TYPO3\CMS\Core\Messaging\AbstractMessage::ERROR ); |
79 | 85 | } |
80 | 86 |
@@ -79,8 +79,7 @@ discard block |
||
79 | 79 | if( copy( $item, $target ) === false ) { |
80 | 80 | throw new \RuntimeException( sprintf( 'Unable to copy file "%1$s"', $item ) ); |
81 | 81 | } |
82 | - } |
|
83 | - else |
|
82 | + } else |
|
84 | 83 | { |
85 | 84 | self::createDirectory( $target ); |
86 | 85 | } |
@@ -158,13 +157,14 @@ discard block |
||
158 | 157 | { |
159 | 158 | \Composer\Factory::createHttpDownloader( $event->getIO(), $config ) |
160 | 159 | ->get( 'https://api.github.com/graphql', $options ); |
161 | - } |
|
162 | - else |
|
160 | + } else |
|
163 | 161 | { |
164 | 162 | \Composer\Factory::createRemoteFilesystem( $event->getIO(), $config ) |
165 | 163 | ->getContents( 'github.com', 'https://api.github.com/graphql', false, $options ); |
166 | 164 | } |
167 | 165 | } |
168 | - catch( \Exception $e ) {} |
|
166 | + catch( \Exception $e ) |
|
167 | + { |
|
168 | +} |
|
169 | 169 | } |
170 | 170 | } |
@@ -7,8 +7,7 @@ |
||
7 | 7 | use Symfony\Component\DependencyInjection\Reference; |
8 | 8 | |
9 | 9 | |
10 | -return function( ContainerConfigurator $configurator, ContainerBuilder $containerBuilder ) |
|
11 | -{ |
|
10 | +return function( ContainerConfigurator $configurator, ContainerBuilder $containerBuilder ) { |
|
12 | 11 | $services = $configurator->services(); |
13 | 12 | |
14 | 13 | if( \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded( 'aimeos' ) ) |
@@ -63,10 +63,12 @@ discard block |
||
63 | 63 | $contents .= $content; |
64 | 64 | } |
65 | 65 | |
66 | - if( !isset( $this->responseFactory ) ) // TYPO3 10 |
|
66 | + if( !isset( $this->responseFactory ) ) { |
|
67 | + // TYPO3 10 |
|
67 | 68 | { |
68 | 69 | if( $type === 'js' ) { |
69 | 70 | $this->response->setHeader( 'Content-Type', 'application/javascript' ); |
71 | + } |
|
70 | 72 | } elseif( $type === 'css' ) { |
71 | 73 | $this->response->setHeader( 'Content-Type', 'text/css' ); |
72 | 74 | } |
@@ -266,12 +268,14 @@ discard block |
||
266 | 268 | */ |
267 | 269 | protected function render() |
268 | 270 | { |
269 | - if( isset( $this->responseFactory ) ) // TYPO3 11 |
|
271 | + if( isset( $this->responseFactory ) ) { |
|
272 | + // TYPO3 11 |
|
270 | 273 | { |
271 | 274 | return $this->responseFactory->createResponse() |
272 | 275 | ->withAddedHeader( 'Content-Type', 'text/html; charset=utf-8' ) |
273 | 276 | ->withBody( $this->streamFactory->createStream( $this->view->render() ) ); |
274 | 277 | } |
278 | + } |
|
275 | 279 | } |
276 | 280 | |
277 | 281 | |
@@ -308,9 +312,11 @@ discard block |
||
308 | 312 | */ |
309 | 313 | protected function setPsrResponse( \Psr\Http\Message\ResponseInterface $response ) |
310 | 314 | { |
311 | - if( !isset( $this->responseFactory ) ) // TYPO3 10 |
|
315 | + if( !isset( $this->responseFactory ) ) { |
|
316 | + // TYPO3 10 |
|
312 | 317 | { |
313 | 318 | $this->response->setStatus( $response->getStatusCode() ); |
319 | + } |
|
314 | 320 | |
315 | 321 | foreach( $response->getHeaders() as $key => $value ) { |
316 | 322 | foreach( (array) $value as $val ) { |
@@ -177,9 +177,11 @@ |
||
177 | 177 | */ |
178 | 178 | protected function setPsrResponse( \Psr\Http\Message\ResponseInterface $response ) |
179 | 179 | { |
180 | - if( !isset( $this->responseFactory ) ) // TYPO3 10 |
|
180 | + if( !isset( $this->responseFactory ) ) { |
|
181 | + // TYPO3 10 |
|
181 | 182 | { |
182 | 183 | $this->response->setStatus( $response->getStatusCode() ); |
184 | + } |
|
183 | 185 | |
184 | 186 | foreach( $response->getHeaders() as $key => $value ) { |
185 | 187 | foreach( (array) $value as $val ) { |
@@ -177,9 +177,11 @@ |
||
177 | 177 | */ |
178 | 178 | protected function setPsrResponse( \Psr\Http\Message\ResponseInterface $response ) |
179 | 179 | { |
180 | - if( !isset( $this->responseFactory ) ) // TYPO3 10 |
|
180 | + if( !isset( $this->responseFactory ) ) { |
|
181 | + // TYPO3 10 |
|
181 | 182 | { |
182 | 183 | $this->response->setStatus( $response->getStatusCode() ); |
184 | + } |
|
183 | 185 | |
184 | 186 | foreach( $response->getHeaders() as $key => $value ) { |
185 | 187 | foreach( (array) $value as $val ) { |
@@ -32,9 +32,11 @@ |
||
32 | 32 | $client = \Aimeos\Client\Html::create( $context, 'account/download' ); |
33 | 33 | $client->setView( $view )->init(); |
34 | 34 | |
35 | - if( !isset( $this->responseFactory ) ) // TYPO3 10 |
|
35 | + if( !isset( $this->responseFactory ) ) { |
|
36 | + // TYPO3 10 |
|
36 | 37 | { |
37 | 38 | $response = $view->response(); |
39 | + } |
|
38 | 40 | |
39 | 41 | $this->response->setStatus( $response->getStatusCode() ); |
40 | 42 |