@@ -194,9 +194,12 @@ |
||
194 | 194 | $psrRequest = new \Zend\Diactoros\ServerRequest(); |
195 | 195 | $flowRequest = $this->request->getHttpRequest(); |
196 | 196 | |
197 | - try { |
|
197 | + try |
|
198 | + { |
|
198 | 199 | $resource = $flowRequest->getContent( true ); |
199 | - } catch( \Neos\Flow\Http\Exception $exception ) { |
|
200 | + } |
|
201 | + catch( \Neos\Flow\Http\Exception $exception ) |
|
202 | + { |
|
200 | 203 | $resource = fopen( 'php://temp', 'rw' ); |
201 | 204 | fwrite( $resource, $flowRequest->getContent() ); |
202 | 205 | } |
@@ -153,7 +153,7 @@ |
||
153 | 153 | $context = $this->context->get( $this->request ); |
154 | 154 | $langid = $context->getLocale()->getLanguageId(); |
155 | 155 | |
156 | - $view =$this->viewContainer->create( $context, $this->uriBuilder, $tmplPaths, $this->request, $langid ); |
|
156 | + $view = $this->viewContainer->create( $context, $this->uriBuilder, $tmplPaths, $this->request, $langid ); |
|
157 | 157 | $context->setView( $view ); |
158 | 158 | |
159 | 159 | return \Aimeos\Client\JsonApi::create( $context, $resource . '/' . $related ); |
@@ -194,9 +194,12 @@ |
||
194 | 194 | $psrRequest = new \Zend\Diactoros\ServerRequest(); |
195 | 195 | $flowRequest = $this->request->getHttpRequest(); |
196 | 196 | |
197 | - try { |
|
197 | + try |
|
198 | + { |
|
198 | 199 | $resource = $flowRequest->getContent( true ); |
199 | - } catch( \Neos\Flow\Http\Exception $exception ) { |
|
200 | + } |
|
201 | + catch( \Neos\Flow\Http\Exception $exception ) |
|
202 | + { |
|
200 | 203 | $resource = fopen( 'php://temp', 'rw' ); |
201 | 204 | fwrite( $resource, $flowRequest->getContent() ); |
202 | 205 | } |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | */ |
63 | 63 | public function listComponentAction() |
64 | 64 | { |
65 | - $this->view->assign( 'output', $this->getOutput( 'catalog/lists' ) ); |
|
65 | + $this->view->assign( 'output', $this->getOutput( 'catalog/lists' ) ); |
|
66 | 66 | } |
67 | 67 | |
68 | 68 | |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | */ |
74 | 74 | public function sessionComponentAction() |
75 | 75 | { |
76 | - $this->view->assign( 'output', $this->getOutput( 'catalog/session' ) ); |
|
76 | + $this->view->assign( 'output', $this->getOutput( 'catalog/session' ) ); |
|
77 | 77 | } |
78 | 78 | |
79 | 79 | |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | */ |
85 | 85 | public function stageComponentAction() |
86 | 86 | { |
87 | - $this->view->assign( 'output', $this->getOutput( 'catalog/stage' ) ); |
|
87 | + $this->view->assign( 'output', $this->getOutput( 'catalog/stage' ) ); |
|
88 | 88 | } |
89 | 89 | |
90 | 90 |
@@ -236,8 +236,7 @@ |
||
236 | 236 | { |
237 | 237 | $i18n = $this->i18n->get( array( $langid ) ); |
238 | 238 | $translation = $i18n[$langid]; |
239 | - } |
|
240 | - else |
|
239 | + } else |
|
241 | 240 | { |
242 | 241 | $translation = new \Aimeos\MW\Translation\None( 'en' ); |
243 | 242 | } |
@@ -71,9 +71,12 @@ |
||
71 | 71 | { |
72 | 72 | $localeManager = \Aimeos\MShop::create( $context, 'locale' ); |
73 | 73 | |
74 | - try { |
|
74 | + try |
|
75 | + { |
|
75 | 76 | $localeItem = $localeManager->bootstrap( $site, '', '', false, null, true ); |
76 | - } catch( \Aimeos\MShop\Exception $e ) { |
|
77 | + } |
|
78 | + catch( \Aimeos\MShop\Exception $e ) |
|
79 | + { |
|
77 | 80 | $localeItem = $localeManager->createItem(); |
78 | 81 | } |
79 | 82 |
@@ -41,11 +41,11 @@ |
||
41 | 41 | * @return array |
42 | 42 | * @api |
43 | 43 | */ |
44 | - public function convertFrom($source, $targetType, array $convertedChildProperties = array(), PropertyMappingConfigurationInterface $configuration = NULL) |
|
44 | + public function convertFrom( $source, $targetType, array $convertedChildProperties = array(), PropertyMappingConfigurationInterface $configuration = NULL ) |
|
45 | 45 | { |
46 | 46 | $result = array(); |
47 | 47 | |
48 | - parse_str($source, $result); |
|
48 | + parse_str( $source, $result ); |
|
49 | 49 | |
50 | 50 | return $result; |
51 | 51 | } |
@@ -41,7 +41,7 @@ |
||
41 | 41 | * @return array |
42 | 42 | * @api |
43 | 43 | */ |
44 | - public function convertFrom($source, $targetType, array $convertedChildProperties = array(), PropertyMappingConfigurationInterface $configuration = NULL) |
|
44 | + public function convertFrom($source, $targetType, array $convertedChildProperties = array(), PropertyMappingConfigurationInterface $configuration = null) |
|
45 | 45 | { |
46 | 46 | $result = array(); |
47 | 47 |
@@ -76,7 +76,7 @@ |
||
76 | 76 | |
77 | 77 | |
78 | 78 | $client = $this->getMockBuilder( '\Aimeos\Client\Html\Catalog\Lists\Standard' ) |
79 | - ->setMethods( array( 'getBody', 'getHeader', 'process') ) |
|
79 | + ->setMethods( array( 'getBody', 'getHeader', 'process' ) ) |
|
80 | 80 | ->disableOriginalConstructor() |
81 | 81 | ->getMock(); |
82 | 82 |
@@ -34,7 +34,7 @@ |
||
34 | 34 | $context->setConfig( new \Aimeos\MW\Config\PHPArray() ); |
35 | 35 | $context->setSession( new \Aimeos\MW\Session\None() ); |
36 | 36 | |
37 | - $uriBuilder = $this->getMockBuilder('\Neos\Flow\Mvc\Routing\UriBuilder') |
|
37 | + $uriBuilder = $this->getMockBuilder( '\Neos\Flow\Mvc\Routing\UriBuilder' ) |
|
38 | 38 | ->disableOriginalConstructor() |
39 | 39 | ->getMock(); |
40 | 40 |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | 'password' => '', |
34 | 34 | ); |
35 | 35 | |
36 | - $settings = array( 'flow' => array( 'apc' => array ( 'enable' => true ) ) ); |
|
36 | + $settings = array( 'flow' => array( 'apc' => array( 'enable' => true ) ) ); |
|
37 | 37 | |
38 | 38 | $this->inject( $config, 'aimeos', $aimeos ); |
39 | 39 | $this->inject( $i18n, 'aimeos', $aimeos ); |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | ->getMock(); |
73 | 73 | |
74 | 74 | $request->expects( $this->once() )->method( 'getHttpRequest' ) |
75 | - ->will( $this->returnValue( $httpRequest ) ) ; |
|
75 | + ->will( $this->returnValue( $httpRequest ) ); |
|
76 | 76 | |
77 | 77 | |
78 | 78 | $localeManager = $this->getMockBuilder( '\Aimeos\MShop\Locale\Manager\Standard' ) |