@@ -10,69 +10,69 @@ |
||
| 10 | 10 | public function testAccount() |
| 11 | 11 | { |
| 12 | 12 | $client = static::createClient(); |
| 13 | - $client->request( 'GET', '/unittest/de/EUR/myaccount' ); |
|
| 13 | + $client->request('GET', '/unittest/de/EUR/myaccount'); |
|
| 14 | 14 | |
| 15 | - $this->assertContains( 'aimeos account-profile', $client->getResponse()->getContent() ); |
|
| 16 | - $this->assertContains( 'aimeos account-history', $client->getResponse()->getContent() ); |
|
| 17 | - $this->assertContains( 'aimeos account-favorite', $client->getResponse()->getContent() ); |
|
| 18 | - $this->assertContains( 'aimeos account-watch', $client->getResponse()->getContent() ); |
|
| 15 | + $this->assertContains('aimeos account-profile', $client->getResponse()->getContent()); |
|
| 16 | + $this->assertContains('aimeos account-history', $client->getResponse()->getContent()); |
|
| 17 | + $this->assertContains('aimeos account-favorite', $client->getResponse()->getContent()); |
|
| 18 | + $this->assertContains('aimeos account-watch', $client->getResponse()->getContent()); |
|
| 19 | 19 | } |
| 20 | 20 | |
| 21 | 21 | |
| 22 | 22 | public function testDownload() |
| 23 | 23 | { |
| 24 | 24 | $client = static::createClient(); |
| 25 | - $client->request( 'GET', '/unittest/de/EUR/myaccount/download/0' ); |
|
| 25 | + $client->request('GET', '/unittest/de/EUR/myaccount/download/0'); |
|
| 26 | 26 | |
| 27 | - $this->assertEquals( 401, $client->getResponse()->getStatusCode() ); |
|
| 27 | + $this->assertEquals(401, $client->getResponse()->getStatusCode()); |
|
| 28 | 28 | } |
| 29 | 29 | |
| 30 | 30 | |
| 31 | 31 | public function testFavoriteComponent() |
| 32 | 32 | { |
| 33 | 33 | $client = static::createClient(); |
| 34 | - $client->request( 'GET', '/unittest/de/EUR/test/favoritecomponent' ); |
|
| 34 | + $client->request('GET', '/unittest/de/EUR/test/favoritecomponent'); |
|
| 35 | 35 | |
| 36 | - $this->assertEquals( 200, $client->getResponse()->getStatusCode() ); |
|
| 37 | - $this->assertContains( 'aimeos account-favorite', $client->getResponse()->getContent() ); |
|
| 36 | + $this->assertEquals(200, $client->getResponse()->getStatusCode()); |
|
| 37 | + $this->assertContains('aimeos account-favorite', $client->getResponse()->getContent()); |
|
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | |
| 41 | 41 | public function testHistoryComponent() |
| 42 | 42 | { |
| 43 | - $mock = $this->getMockBuilder( 'Aimeos\ShopBundle\Controller\AccountController' ) |
|
| 44 | - ->setMethods( array( 'getOutput' ) ) |
|
| 43 | + $mock = $this->getMockBuilder('Aimeos\ShopBundle\Controller\AccountController') |
|
| 44 | + ->setMethods(array('getOutput')) |
|
| 45 | 45 | ->disableOriginalConstructor() |
| 46 | 46 | ->getMock(); |
| 47 | 47 | |
| 48 | - $mock->expects( $this->once() )->method( 'getOutput' )->will( $this->returnValue( 'test' ) ); |
|
| 48 | + $mock->expects($this->once())->method('getOutput')->will($this->returnValue('test')); |
|
| 49 | 49 | |
| 50 | - $this->assertEquals( 'test', $mock->historyComponentAction() ); |
|
| 50 | + $this->assertEquals('test', $mock->historyComponentAction()); |
|
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | |
| 54 | 54 | public function testProfileComponent() |
| 55 | 55 | { |
| 56 | - $mock = $this->getMockBuilder( 'Aimeos\ShopBundle\Controller\AccountController' ) |
|
| 57 | - ->setMethods( array( 'getOutput' ) ) |
|
| 56 | + $mock = $this->getMockBuilder('Aimeos\ShopBundle\Controller\AccountController') |
|
| 57 | + ->setMethods(array('getOutput')) |
|
| 58 | 58 | ->disableOriginalConstructor() |
| 59 | 59 | ->getMock(); |
| 60 | 60 | |
| 61 | - $mock->expects( $this->once() )->method( 'getOutput' )->will( $this->returnValue( 'test' ) ); |
|
| 61 | + $mock->expects($this->once())->method('getOutput')->will($this->returnValue('test')); |
|
| 62 | 62 | |
| 63 | - $this->assertEquals( 'test', $mock->profileComponentAction() ); |
|
| 63 | + $this->assertEquals('test', $mock->profileComponentAction()); |
|
| 64 | 64 | } |
| 65 | 65 | |
| 66 | 66 | |
| 67 | 67 | public function testWatchComponent() |
| 68 | 68 | { |
| 69 | - $mock = $this->getMockBuilder( 'Aimeos\ShopBundle\Controller\AccountController' ) |
|
| 70 | - ->setMethods( array( 'getOutput' ) ) |
|
| 69 | + $mock = $this->getMockBuilder('Aimeos\ShopBundle\Controller\AccountController') |
|
| 70 | + ->setMethods(array('getOutput')) |
|
| 71 | 71 | ->disableOriginalConstructor() |
| 72 | 72 | ->getMock(); |
| 73 | 73 | |
| 74 | - $mock->expects( $this->once() )->method( 'getOutput' )->will( $this->returnValue( 'test' ) ); |
|
| 74 | + $mock->expects($this->once())->method('getOutput')->will($this->returnValue('test')); |
|
| 75 | 75 | |
| 76 | - $this->assertEquals( 'test', $mock->watchComponentAction() ); |
|
| 76 | + $this->assertEquals('test', $mock->watchComponentAction()); |
|
| 77 | 77 | } |
| 78 | 78 | } |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | * |
| 29 | 29 | * @param Container $container Container object to access parameters |
| 30 | 30 | */ |
| 31 | - public function __construct( Container $container ) |
|
| 31 | + public function __construct(Container $container) |
|
| 32 | 32 | { |
| 33 | 33 | $this->container = $container; |
| 34 | 34 | } |
@@ -40,33 +40,33 @@ discard block |
||
| 40 | 40 | * @param string $type Configuration type ("frontend" or "backend") |
| 41 | 41 | * @return \Aimeos\MW\Config\Iface Config object |
| 42 | 42 | */ |
| 43 | - public function get( $type = 'frontend' ) |
|
| 43 | + public function get($type = 'frontend') |
|
| 44 | 44 | { |
| 45 | 45 | $configPaths = $this->container->get('aimeos')->get()->getConfigPaths(); |
| 46 | 46 | |
| 47 | - $conf = new \Aimeos\MW\Config\PHPArray( array(), $configPaths ); |
|
| 47 | + $conf = new \Aimeos\MW\Config\PHPArray(array(), $configPaths); |
|
| 48 | 48 | |
| 49 | - $apc = (bool) $this->container->getParameter( 'aimeos_shop.apc_enable' ); |
|
| 50 | - $prefix = $this->container->getParameter( 'aimeos_shop.apc_prefix' ); |
|
| 49 | + $apc = (bool) $this->container->getParameter('aimeos_shop.apc_enable'); |
|
| 50 | + $prefix = $this->container->getParameter('aimeos_shop.apc_prefix'); |
|
| 51 | 51 | |
| 52 | - if( function_exists( 'apc_store' ) === true && $apc === true ) { |
|
| 53 | - $conf = new \Aimeos\MW\Config\Decorator\APC( $conf, $prefix ); |
|
| 52 | + if (function_exists('apc_store') === true && $apc === true) { |
|
| 53 | + $conf = new \Aimeos\MW\Config\Decorator\APC($conf, $prefix); |
|
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | $local = array( |
| 57 | - 'admin' => $this->container->getParameter( 'aimeos_shop.admin' ), |
|
| 58 | - 'client' => $this->container->getParameter( 'aimeos_shop.client' ), |
|
| 59 | - 'controller' => $this->container->getParameter( 'aimeos_shop.controller' ), |
|
| 60 | - 'madmin' => $this->container->getParameter( 'aimeos_shop.madmin' ), |
|
| 61 | - 'mshop' => $this->container->getParameter( 'aimeos_shop.mshop' ), |
|
| 62 | - 'resource' => $this->container->getParameter( 'aimeos_shop.resource' ), |
|
| 57 | + 'admin' => $this->container->getParameter('aimeos_shop.admin'), |
|
| 58 | + 'client' => $this->container->getParameter('aimeos_shop.client'), |
|
| 59 | + 'controller' => $this->container->getParameter('aimeos_shop.controller'), |
|
| 60 | + 'madmin' => $this->container->getParameter('aimeos_shop.madmin'), |
|
| 61 | + 'mshop' => $this->container->getParameter('aimeos_shop.mshop'), |
|
| 62 | + 'resource' => $this->container->getParameter('aimeos_shop.resource'), |
|
| 63 | 63 | ); |
| 64 | 64 | |
| 65 | - $config = new \Aimeos\MW\Config\Decorator\Memory( $conf, $local ); |
|
| 66 | - $settings = $this->container->getParameter( 'aimeos_shop.' . $type ); |
|
| 65 | + $config = new \Aimeos\MW\Config\Decorator\Memory($conf, $local); |
|
| 66 | + $settings = $this->container->getParameter('aimeos_shop.'.$type); |
|
| 67 | 67 | |
| 68 | - if( $settings !== array() ) { |
|
| 69 | - $config = new \Aimeos\MW\Config\Decorator\Memory( $config, $settings ); |
|
| 68 | + if ($settings !== array()) { |
|
| 69 | + $config = new \Aimeos\MW\Config\Decorator\Memory($config, $settings); |
|
| 70 | 70 | } |
| 71 | 71 | |
| 72 | 72 | return $config; |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | * |
| 32 | 32 | * @param Container $container Container object to access parameters |
| 33 | 33 | */ |
| 34 | - public function __construct( Container $container ) |
|
| 34 | + public function __construct(Container $container) |
|
| 35 | 35 | { |
| 36 | 36 | $this->container = $container; |
| 37 | 37 | } |
@@ -44,37 +44,37 @@ discard block |
||
| 44 | 44 | * @param string $type Configuration type ("frontend" or "backend") |
| 45 | 45 | * @return \Aimeos\MShop\Context\Item\Iface Context object |
| 46 | 46 | */ |
| 47 | - public function get( $locale = true, $type = 'frontend' ) |
|
| 47 | + public function get($locale = true, $type = 'frontend') |
|
| 48 | 48 | { |
| 49 | - $config = $this->container->get( 'aimeos_config' )->get( $type ); |
|
| 49 | + $config = $this->container->get('aimeos_config')->get($type); |
|
| 50 | 50 | |
| 51 | - if( self::$context === null ) |
|
| 51 | + if (self::$context === null) |
|
| 52 | 52 | { |
| 53 | 53 | $context = new \Aimeos\MShop\Context\Item\Standard(); |
| 54 | - $context->setConfig( $config ); |
|
| 54 | + $context->setConfig($config); |
|
| 55 | 55 | |
| 56 | - $this->addDataBaseManager( $context ); |
|
| 57 | - $this->addFilesystemManager( $context ); |
|
| 58 | - $this->addMessageQueueManager( $context ); |
|
| 59 | - $this->addLogger( $context ); |
|
| 60 | - $this->addCache( $context ); |
|
| 61 | - $this->addMailer( $context); |
|
| 56 | + $this->addDataBaseManager($context); |
|
| 57 | + $this->addFilesystemManager($context); |
|
| 58 | + $this->addMessageQueueManager($context); |
|
| 59 | + $this->addLogger($context); |
|
| 60 | + $this->addCache($context); |
|
| 61 | + $this->addMailer($context); |
|
| 62 | 62 | |
| 63 | 63 | self::$context = $context; |
| 64 | 64 | } |
| 65 | 65 | |
| 66 | 66 | $context = self::$context; |
| 67 | - $context->setConfig( $config ); |
|
| 67 | + $context->setConfig($config); |
|
| 68 | 68 | |
| 69 | - if( $locale === true ) |
|
| 69 | + if ($locale === true) |
|
| 70 | 70 | { |
| 71 | - $localeItem = $this->container->get('aimeos_locale')->get( $context ); |
|
| 72 | - $context->setI18n( $this->container->get('aimeos_i18n')->get( array( $localeItem->getLanguageId() ) ) ); |
|
| 73 | - $context->setLocale( $localeItem ); |
|
| 71 | + $localeItem = $this->container->get('aimeos_locale')->get($context); |
|
| 72 | + $context->setI18n($this->container->get('aimeos_i18n')->get(array($localeItem->getLanguageId()))); |
|
| 73 | + $context->setLocale($localeItem); |
|
| 74 | 74 | } |
| 75 | 75 | |
| 76 | - $this->addSession( $context ); |
|
| 77 | - $this->addUserGroups( $context); |
|
| 76 | + $this->addSession($context); |
|
| 77 | + $this->addUserGroups($context); |
|
| 78 | 78 | |
| 79 | 79 | return $context; |
| 80 | 80 | } |
@@ -86,10 +86,10 @@ discard block |
||
| 86 | 86 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object including config |
| 87 | 87 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object |
| 88 | 88 | */ |
| 89 | - protected function addCache( \Aimeos\MShop\Context\Item\Iface $context ) |
|
| 89 | + protected function addCache(\Aimeos\MShop\Context\Item\Iface $context) |
|
| 90 | 90 | { |
| 91 | - $cache = new \Aimeos\MAdmin\Cache\Proxy\Standard( $context ); |
|
| 92 | - $context->setCache( $cache ); |
|
| 91 | + $cache = new \Aimeos\MAdmin\Cache\Proxy\Standard($context); |
|
| 92 | + $context->setCache($cache); |
|
| 93 | 93 | |
| 94 | 94 | return $context; |
| 95 | 95 | } |
@@ -101,10 +101,10 @@ discard block |
||
| 101 | 101 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
| 102 | 102 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object |
| 103 | 103 | */ |
| 104 | - protected function addDatabaseManager( \Aimeos\MShop\Context\Item\Iface $context ) |
|
| 104 | + protected function addDatabaseManager(\Aimeos\MShop\Context\Item\Iface $context) |
|
| 105 | 105 | { |
| 106 | - $dbm = new \Aimeos\MW\DB\Manager\DBAL( $context->getConfig() ); |
|
| 107 | - $context->setDatabaseManager( $dbm ); |
|
| 106 | + $dbm = new \Aimeos\MW\DB\Manager\DBAL($context->getConfig()); |
|
| 107 | + $context->setDatabaseManager($dbm); |
|
| 108 | 108 | |
| 109 | 109 | return $context; |
| 110 | 110 | } |
@@ -116,10 +116,10 @@ discard block |
||
| 116 | 116 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
| 117 | 117 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object |
| 118 | 118 | */ |
| 119 | - protected function addFilesystemManager( \Aimeos\MShop\Context\Item\Iface $context ) |
|
| 119 | + protected function addFilesystemManager(\Aimeos\MShop\Context\Item\Iface $context) |
|
| 120 | 120 | { |
| 121 | - $fs = new \Aimeos\MW\Filesystem\Manager\Standard( $context->getConfig() ); |
|
| 122 | - $context->setFilesystemManager( $fs ); |
|
| 121 | + $fs = new \Aimeos\MW\Filesystem\Manager\Standard($context->getConfig()); |
|
| 122 | + $context->setFilesystemManager($fs); |
|
| 123 | 123 | |
| 124 | 124 | return $context; |
| 125 | 125 | } |
@@ -131,10 +131,10 @@ discard block |
||
| 131 | 131 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
| 132 | 132 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object |
| 133 | 133 | */ |
| 134 | - protected function addLogger( \Aimeos\MShop\Context\Item\Iface $context ) |
|
| 134 | + protected function addLogger(\Aimeos\MShop\Context\Item\Iface $context) |
|
| 135 | 135 | { |
| 136 | - $logger = \Aimeos\MAdmin\Log\Manager\Factory::createManager( $context ); |
|
| 137 | - $context->setLogger( $logger ); |
|
| 136 | + $logger = \Aimeos\MAdmin\Log\Manager\Factory::createManager($context); |
|
| 137 | + $context->setLogger($logger); |
|
| 138 | 138 | |
| 139 | 139 | return $context; |
| 140 | 140 | } |
@@ -147,11 +147,11 @@ discard block |
||
| 147 | 147 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
| 148 | 148 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object |
| 149 | 149 | */ |
| 150 | - protected function addMailer( \Aimeos\MShop\Context\Item\Iface $context ) |
|
| 150 | + protected function addMailer(\Aimeos\MShop\Context\Item\Iface $context) |
|
| 151 | 151 | { |
| 152 | 152 | $container = $this->container; |
| 153 | - $mail = new \Aimeos\MW\Mail\Swift( function() use ( $container) { return $container->get( 'mailer' ); } ); |
|
| 154 | - $context->setMail( $mail ); |
|
| 153 | + $mail = new \Aimeos\MW\Mail\Swift(function() use ($container) { return $container->get('mailer'); } ); |
|
| 154 | + $context->setMail($mail); |
|
| 155 | 155 | |
| 156 | 156 | return $context; |
| 157 | 157 | } |
@@ -163,10 +163,10 @@ discard block |
||
| 163 | 163 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
| 164 | 164 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object |
| 165 | 165 | */ |
| 166 | - protected function addMessageQueueManager( \Aimeos\MShop\Context\Item\Iface $context ) |
|
| 166 | + protected function addMessageQueueManager(\Aimeos\MShop\Context\Item\Iface $context) |
|
| 167 | 167 | { |
| 168 | - $mq = new \Aimeos\MW\MQueue\Manager\Standard( $context->getConfig() ); |
|
| 169 | - $context->setMessageQueueManager( $mq ); |
|
| 168 | + $mq = new \Aimeos\MW\MQueue\Manager\Standard($context->getConfig()); |
|
| 169 | + $context->setMessageQueueManager($mq); |
|
| 170 | 170 | |
| 171 | 171 | return $context; |
| 172 | 172 | } |
@@ -178,10 +178,10 @@ discard block |
||
| 178 | 178 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
| 179 | 179 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object |
| 180 | 180 | */ |
| 181 | - protected function addSession( \Aimeos\MShop\Context\Item\Iface $context ) |
|
| 181 | + protected function addSession(\Aimeos\MShop\Context\Item\Iface $context) |
|
| 182 | 182 | { |
| 183 | - $session = new \Aimeos\MW\Session\Symfony2( $this->container->get( 'session' ) ); |
|
| 184 | - $context->setSession( $session ); |
|
| 183 | + $session = new \Aimeos\MW\Session\Symfony2($this->container->get('session')); |
|
| 184 | + $context->setSession($session); |
|
| 185 | 185 | |
| 186 | 186 | return $context; |
| 187 | 187 | } |
@@ -192,38 +192,38 @@ discard block |
||
| 192 | 192 | * |
| 193 | 193 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
| 194 | 194 | */ |
| 195 | - protected function addUserGroups( \Aimeos\MShop\Context\Item\Iface $context ) |
|
| 195 | + protected function addUserGroups(\Aimeos\MShop\Context\Item\Iface $context) |
|
| 196 | 196 | { |
| 197 | 197 | $token = null; |
| 198 | 198 | $username = ''; |
| 199 | 199 | |
| 200 | - if( $this->container->has( 'security.token_storage' ) ) { |
|
| 201 | - $token = $this->container->get( 'security.token_storage' )->getToken(); |
|
| 200 | + if ($this->container->has('security.token_storage')) { |
|
| 201 | + $token = $this->container->get('security.token_storage')->getToken(); |
|
| 202 | 202 | } |
| 203 | - else if( $this->container->has( 'security.context' ) ) { |
|
| 204 | - $token = $this->container->get( 'security.context' )->getToken(); |
|
| 203 | + else if ($this->container->has('security.context')) { |
|
| 204 | + $token = $this->container->get('security.context')->getToken(); |
|
| 205 | 205 | } |
| 206 | 206 | |
| 207 | - if( is_object( $token ) ) |
|
| 207 | + if (is_object($token)) |
|
| 208 | 208 | { |
| 209 | - if( method_exists( $token->getUser(), 'getId' ) ) |
|
| 209 | + if (method_exists($token->getUser(), 'getId')) |
|
| 210 | 210 | { |
| 211 | 211 | $userid = $token->getUser()->getId(); |
| 212 | - $context->setUserId( $userid ); |
|
| 213 | - $context->setGroupIds( function() use ( $context, $userid ) |
|
| 212 | + $context->setUserId($userid); |
|
| 213 | + $context->setGroupIds(function() use ($context, $userid) |
|
| 214 | 214 | { |
| 215 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'customer' ); |
|
| 216 | - return $manager->getItem( $userid, array( 'customer/group' ) )->getGroups(); |
|
| 215 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'customer'); |
|
| 216 | + return $manager->getItem($userid, array('customer/group'))->getGroups(); |
|
| 217 | 217 | } ); |
| 218 | 218 | } |
| 219 | 219 | |
| 220 | - if( is_object( $token->getUser() ) ) { |
|
| 221 | - $username = $token->getUser()->getUsername(); |
|
| 220 | + if (is_object($token->getUser())) { |
|
| 221 | + $username = $token->getUser()->getUsername(); |
|
| 222 | 222 | } else { |
| 223 | 223 | $username = $token->getUser(); |
| 224 | 224 | } |
| 225 | 225 | } |
| 226 | 226 | |
| 227 | - $context->setEditor( $username ); |
|
| 227 | + $context->setEditor($username); |
|
| 228 | 228 | } |
| 229 | 229 | } |
@@ -27,15 +27,15 @@ |
||
| 27 | 27 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
| 28 | 28 | * @return array List of group codes the user is in |
| 29 | 29 | */ |
| 30 | - public function getGroups( \Aimeos\MShop\Context\Item\Iface $context ) |
|
| 30 | + public function getGroups(\Aimeos\MShop\Context\Item\Iface $context) |
|
| 31 | 31 | { |
| 32 | 32 | $list = array(); |
| 33 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/group' ); |
|
| 33 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'customer/group'); |
|
| 34 | 34 | |
| 35 | 35 | $search = $manager->createSearch(); |
| 36 | - $search->setConditions( $search->compare( '==', 'customer.group.id', $context->getGroupIds() ) ); |
|
| 36 | + $search->setConditions($search->compare('==', 'customer.group.id', $context->getGroupIds())); |
|
| 37 | 37 | |
| 38 | - foreach( $manager->searchItems( $search ) as $item ) { |
|
| 38 | + foreach ($manager->searchItems($search) as $item) { |
|
| 39 | 39 | $list[] = $item->getCode(); |
| 40 | 40 | } |
| 41 | 41 | |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | * @param RequestStack $requestStack Current request stack |
| 33 | 33 | * @param Container $container Container object to access parameters |
| 34 | 34 | */ |
| 35 | - public function __construct( RequestStack $requestStack, Container $container ) |
|
| 35 | + public function __construct(RequestStack $requestStack, Container $container) |
|
| 36 | 36 | { |
| 37 | 37 | $this->requestStack = $requestStack; |
| 38 | 38 | $this->container = $container; |
@@ -45,19 +45,19 @@ discard block |
||
| 45 | 45 | * @param \Aimeos\MShop\Context\Item\Iface $context Context object |
| 46 | 46 | * @return \Aimeos\MShop\Locale\Item\Iface Locale item object |
| 47 | 47 | */ |
| 48 | - public function get( \Aimeos\MShop\Context\Item\Iface $context ) |
|
| 48 | + public function get(\Aimeos\MShop\Context\Item\Iface $context) |
|
| 49 | 49 | { |
| 50 | - if( $this->locale === null ) |
|
| 50 | + if ($this->locale === null) |
|
| 51 | 51 | { |
| 52 | - $status = $this->container->getParameter( 'aimeos_shop.disable_sites' ); |
|
| 52 | + $status = $this->container->getParameter('aimeos_shop.disable_sites'); |
|
| 53 | 53 | $request = $this->requestStack->getMasterRequest(); |
| 54 | 54 | |
| 55 | - $site = $request->attributes->get( 'site', $request->query->get( 'site', 'default' ) ); |
|
| 56 | - $currency = $request->attributes->get( 'currency', $request->query->get( 'currency', '' ) ); |
|
| 57 | - $lang = $request->attributes->get( 'locale', $request->query->get( 'locale', '' ) ); |
|
| 55 | + $site = $request->attributes->get('site', $request->query->get('site', 'default')); |
|
| 56 | + $currency = $request->attributes->get('currency', $request->query->get('currency', '')); |
|
| 57 | + $lang = $request->attributes->get('locale', $request->query->get('locale', '')); |
|
| 58 | 58 | |
| 59 | - $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context ); |
|
| 60 | - $this->locale = $localeManager->bootstrap( $site, $lang, $currency, $status ); |
|
| 59 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context); |
|
| 60 | + $this->locale = $localeManager->bootstrap($site, $lang, $currency, $status); |
|
| 61 | 61 | } |
| 62 | 62 | |
| 63 | 63 | return $this->locale; |
@@ -71,17 +71,17 @@ discard block |
||
| 71 | 71 | * @param string $site Unique site code |
| 72 | 72 | * @return \Aimeos\MShop\Locale\Item\Iface Locale item object |
| 73 | 73 | */ |
| 74 | - public function getBackend( \Aimeos\MShop\Context\Item\Iface $context, $site ) |
|
| 74 | + public function getBackend(\Aimeos\MShop\Context\Item\Iface $context, $site) |
|
| 75 | 75 | { |
| 76 | - $localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' ); |
|
| 76 | + $localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale'); |
|
| 77 | 77 | |
| 78 | 78 | try |
| 79 | 79 | { |
| 80 | - $localeItem = $localeManager->bootstrap( $site, '', '', false ); |
|
| 81 | - $localeItem->setLanguageId( null ); |
|
| 82 | - $localeItem->setCurrencyId( null ); |
|
| 80 | + $localeItem = $localeManager->bootstrap($site, '', '', false); |
|
| 81 | + $localeItem->setLanguageId(null); |
|
| 82 | + $localeItem->setCurrencyId(null); |
|
| 83 | 83 | } |
| 84 | - catch( \Aimeos\MShop\Locale\Exception $e ) |
|
| 84 | + catch (\Aimeos\MShop\Locale\Exception $e) |
|
| 85 | 85 | { |
| 86 | 86 | $localeItem = $localeManager->createItem(); |
| 87 | 87 | } |
@@ -31,15 +31,15 @@ discard block |
||
| 31 | 31 | * @param string $site Unique site code |
| 32 | 32 | * @return \Symfony\Component\HttpFoundation\Response Response object containing the generated output |
| 33 | 33 | */ |
| 34 | - public function deleteAction( Request $request, $resource, $site = 'default' ) |
|
| 34 | + public function deleteAction(Request $request, $resource, $site = 'default') |
|
| 35 | 35 | { |
| 36 | 36 | $status = 500; |
| 37 | 37 | $header = $request->headers->all(); |
| 38 | 38 | |
| 39 | - $client = $this->createClient( $site, $resource, $request->get( 'lang', 'en' ) ); |
|
| 40 | - $result = $client->delete( $request->getContent(), $header, $status ); |
|
| 39 | + $client = $this->createClient($site, $resource, $request->get('lang', 'en')); |
|
| 40 | + $result = $client->delete($request->getContent(), $header, $status); |
|
| 41 | 41 | |
| 42 | - return $this->createResponse( $result, $status, $header ); |
|
| 42 | + return $this->createResponse($result, $status, $header); |
|
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | |
@@ -51,15 +51,15 @@ discard block |
||
| 51 | 51 | * @param string $site Unique site code |
| 52 | 52 | * @return \Symfony\Component\HttpFoundation\Response Response object containing the generated output |
| 53 | 53 | */ |
| 54 | - public function getAction( Request $request, $resource, $site = 'default' ) |
|
| 54 | + public function getAction(Request $request, $resource, $site = 'default') |
|
| 55 | 55 | { |
| 56 | 56 | $status = 500; |
| 57 | 57 | $header = $request->headers->all(); |
| 58 | 58 | |
| 59 | - $client = $this->createClient( $site, $resource, $request->get( 'lang', 'en' ) ); |
|
| 60 | - $result = $client->get( $request->getContent(), $header, $status ); |
|
| 59 | + $client = $this->createClient($site, $resource, $request->get('lang', 'en')); |
|
| 60 | + $result = $client->get($request->getContent(), $header, $status); |
|
| 61 | 61 | |
| 62 | - return $this->createResponse( $result, $status, $header ); |
|
| 62 | + return $this->createResponse($result, $status, $header); |
|
| 63 | 63 | } |
| 64 | 64 | |
| 65 | 65 | |
@@ -71,15 +71,15 @@ discard block |
||
| 71 | 71 | * @param string $site Unique site code |
| 72 | 72 | * @return \Symfony\Component\HttpFoundation\Response Response object containing the generated output |
| 73 | 73 | */ |
| 74 | - public function patchAction( Request $request, $resource, $site = 'default' ) |
|
| 74 | + public function patchAction(Request $request, $resource, $site = 'default') |
|
| 75 | 75 | { |
| 76 | 76 | $status = 500; |
| 77 | 77 | $header = $request->headers->all(); |
| 78 | 78 | |
| 79 | - $client = $this->createClient( $site, $resource, $request->get( 'lang', 'en' ) ); |
|
| 80 | - $result = $client->patch( $request->getContent(), $header, $status ); |
|
| 79 | + $client = $this->createClient($site, $resource, $request->get('lang', 'en')); |
|
| 80 | + $result = $client->patch($request->getContent(), $header, $status); |
|
| 81 | 81 | |
| 82 | - return $this->createResponse( $result, $status, $header ); |
|
| 82 | + return $this->createResponse($result, $status, $header); |
|
| 83 | 83 | } |
| 84 | 84 | |
| 85 | 85 | |
@@ -91,15 +91,15 @@ discard block |
||
| 91 | 91 | * @param string $site Unique site code |
| 92 | 92 | * @return \Symfony\Component\HttpFoundation\Response Response object containing the generated output |
| 93 | 93 | */ |
| 94 | - public function postAction( Request $request, $resource, $site = 'default' ) |
|
| 94 | + public function postAction(Request $request, $resource, $site = 'default') |
|
| 95 | 95 | { |
| 96 | 96 | $status = 500; |
| 97 | 97 | $header = $request->headers->all(); |
| 98 | 98 | |
| 99 | - $client = $this->createClient( $site, $resource, $request->get( 'lang', 'en' ) ); |
|
| 100 | - $result = $client->post( $request->getContent(), $header, $status ); |
|
| 99 | + $client = $this->createClient($site, $resource, $request->get('lang', 'en')); |
|
| 100 | + $result = $client->post($request->getContent(), $header, $status); |
|
| 101 | 101 | |
| 102 | - return $this->createResponse( $result, $status, $header ); |
|
| 102 | + return $this->createResponse($result, $status, $header); |
|
| 103 | 103 | } |
| 104 | 104 | |
| 105 | 105 | |
@@ -111,15 +111,15 @@ discard block |
||
| 111 | 111 | * @param string $site Unique site code |
| 112 | 112 | * @return \Symfony\Component\HttpFoundation\Response Response object containing the generated output |
| 113 | 113 | */ |
| 114 | - public function putAction( Request $request, $resource, $site = 'default' ) |
|
| 114 | + public function putAction(Request $request, $resource, $site = 'default') |
|
| 115 | 115 | { |
| 116 | 116 | $status = 500; |
| 117 | 117 | $header = $request->headers->all(); |
| 118 | 118 | |
| 119 | - $client = $this->createClient( $site, $resource, $request->get( 'lang', 'en' ) ); |
|
| 120 | - $result = $client->put( $request->getContent(), $header, $status ); |
|
| 119 | + $client = $this->createClient($site, $resource, $request->get('lang', 'en')); |
|
| 120 | + $result = $client->put($request->getContent(), $header, $status); |
|
| 121 | 121 | |
| 122 | - return $this->createResponse( $result, $status, $header ); |
|
| 122 | + return $this->createResponse($result, $status, $header); |
|
| 123 | 123 | } |
| 124 | 124 | |
| 125 | 125 | |
@@ -131,15 +131,15 @@ discard block |
||
| 131 | 131 | * @param string $site Unique site code |
| 132 | 132 | * @return \Symfony\Component\HttpFoundation\Response Response object containing the generated output |
| 133 | 133 | */ |
| 134 | - public function optionsAction( Request $request, $resource = '', $site = 'default' ) |
|
| 134 | + public function optionsAction(Request $request, $resource = '', $site = 'default') |
|
| 135 | 135 | { |
| 136 | 136 | $status = 500; |
| 137 | 137 | $header = $request->headers->all(); |
| 138 | 138 | |
| 139 | - $client = $this->createClient( $site, $resource, $request->get( 'lang', 'en' ) ); |
|
| 140 | - $result = $client->options( $request->getContent(), $header, $status ); |
|
| 139 | + $client = $this->createClient($site, $resource, $request->get('lang', 'en')); |
|
| 140 | + $result = $client->options($request->getContent(), $header, $status); |
|
| 141 | 141 | |
| 142 | - return $this->createResponse( $result, $status, $header ); |
|
| 142 | + return $this->createResponse($result, $status, $header); |
|
| 143 | 143 | } |
| 144 | 144 | |
| 145 | 145 | |
@@ -151,19 +151,19 @@ discard block |
||
| 151 | 151 | * @param string $lang Language code |
| 152 | 152 | * @return \Aimeos\MShop\Context\Item\Iface Context item |
| 153 | 153 | */ |
| 154 | - protected function createClient( $site, $resource, $lang ) |
|
| 154 | + protected function createClient($site, $resource, $lang) |
|
| 155 | 155 | { |
| 156 | - $aimeos = $this->get( 'aimeos' )->get(); |
|
| 157 | - $templatePaths = $aimeos->getCustomPaths( 'admin/jsonadm/templates' ); |
|
| 156 | + $aimeos = $this->get('aimeos')->get(); |
|
| 157 | + $templatePaths = $aimeos->getCustomPaths('admin/jsonadm/templates'); |
|
| 158 | 158 | |
| 159 | - $context = $this->get( 'aimeos_context' )->get( false, 'backend' ); |
|
| 160 | - $context->setI18n( $this->get('aimeos_i18n')->get( array( $lang, 'en' ) ) ); |
|
| 161 | - $context->setLocale( $this->get('aimeos_locale')->getBackend( $context, $site ) ); |
|
| 159 | + $context = $this->get('aimeos_context')->get(false, 'backend'); |
|
| 160 | + $context->setI18n($this->get('aimeos_i18n')->get(array($lang, 'en'))); |
|
| 161 | + $context->setLocale($this->get('aimeos_locale')->getBackend($context, $site)); |
|
| 162 | 162 | |
| 163 | - $view = $this->get('aimeos_view')->create( $context, $templatePaths, $lang ); |
|
| 164 | - $context->setView( $view ); |
|
| 163 | + $view = $this->get('aimeos_view')->create($context, $templatePaths, $lang); |
|
| 164 | + $context->setView($view); |
|
| 165 | 165 | |
| 166 | - return \Aimeos\Admin\JsonAdm\Factory::createClient( $context, $templatePaths, $resource ); |
|
| 166 | + return \Aimeos\Admin\JsonAdm\Factory::createClient($context, $templatePaths, $resource); |
|
| 167 | 167 | } |
| 168 | 168 | |
| 169 | 169 | |
@@ -175,14 +175,14 @@ discard block |
||
| 175 | 175 | * @param array $header List of HTTP headers |
| 176 | 176 | * @return Response HTTP response object |
| 177 | 177 | */ |
| 178 | - protected function createResponse( $content, $status, array $header ) |
|
| 178 | + protected function createResponse($content, $status, array $header) |
|
| 179 | 179 | { |
| 180 | 180 | $response = new Response(); |
| 181 | - $response->setContent( $content ); |
|
| 182 | - $response->setStatusCode( $status ); |
|
| 181 | + $response->setContent($content); |
|
| 182 | + $response->setStatusCode($status); |
|
| 183 | 183 | |
| 184 | - foreach( $header as $key => $value ) { |
|
| 185 | - $response->headers->set( $key, $value ); |
|
| 184 | + foreach ($header as $key => $value) { |
|
| 185 | + $response->headers->set($key, $value); |
|
| 186 | 186 | } |
| 187 | 187 | |
| 188 | 188 | return $response; |
@@ -30,63 +30,63 @@ discard block |
||
| 30 | 30 | * @param Request $request Symfony request object |
| 31 | 31 | * @return Response Generated output for the admin interface |
| 32 | 32 | */ |
| 33 | - public function indexAction( Request $request ) |
|
| 33 | + public function indexAction(Request $request) |
|
| 34 | 34 | { |
| 35 | - $site = $request->attributes->get( 'site', $request->query->get( 'site', 'default' ) ); |
|
| 36 | - $lang = $request->attributes->get( 'lang', $request->query->get( 'lang', 'en' ) ); |
|
| 37 | - $tab = $request->attributes->get( 'tab', $request->query->get( 'tab', 0 ) ); |
|
| 35 | + $site = $request->attributes->get('site', $request->query->get('site', 'default')); |
|
| 36 | + $lang = $request->attributes->get('lang', $request->query->get('lang', 'en')); |
|
| 37 | + $tab = $request->attributes->get('tab', $request->query->get('tab', 0)); |
|
| 38 | 38 | |
| 39 | - $context = $this->get( 'aimeos_context' )->get( false, 'backend' ); |
|
| 40 | - $context->setLocale( $this->get( 'aimeos_locale' )->getBackend( $context, $site ) ); |
|
| 39 | + $context = $this->get('aimeos_context')->get(false, 'backend'); |
|
| 40 | + $context->setLocale($this->get('aimeos_locale')->getBackend($context, $site)); |
|
| 41 | 41 | |
| 42 | - $aimeos = $this->get( 'aimeos' ); |
|
| 42 | + $aimeos = $this->get('aimeos'); |
|
| 43 | 43 | $bootstrap = $aimeos->get(); |
| 44 | 44 | |
| 45 | - $cntlPaths = $bootstrap->getCustomPaths( 'controller/extjs' ); |
|
| 46 | - $controller = new \Aimeos\Controller\ExtJS\JsonRpc( $context, $cntlPaths ); |
|
| 45 | + $cntlPaths = $bootstrap->getCustomPaths('controller/extjs'); |
|
| 46 | + $controller = new \Aimeos\Controller\ExtJS\JsonRpc($context, $cntlPaths); |
|
| 47 | 47 | $cssFiles = array(); |
| 48 | 48 | |
| 49 | - foreach( $bootstrap->getCustomPaths( 'admin/extjs' ) as $base => $paths ) |
|
| 49 | + foreach ($bootstrap->getCustomPaths('admin/extjs') as $base => $paths) |
|
| 50 | 50 | { |
| 51 | - foreach( $paths as $path ) |
|
| 51 | + foreach ($paths as $path) |
|
| 52 | 52 | { |
| 53 | - $jsbAbsPath = $base . '/' . $path; |
|
| 53 | + $jsbAbsPath = $base.'/'.$path; |
|
| 54 | 54 | |
| 55 | - if( !is_file( $jsbAbsPath ) ) { |
|
| 56 | - throw new \Exception( sprintf( 'JSB2 file "%1$s" not found', $jsbAbsPath ) ); |
|
| 55 | + if (!is_file($jsbAbsPath)) { |
|
| 56 | + throw new \Exception(sprintf('JSB2 file "%1$s" not found', $jsbAbsPath)); |
|
| 57 | 57 | } |
| 58 | 58 | |
| 59 | - $jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $path ) ); |
|
| 60 | - $cssFiles = array_merge( $cssFiles, $jsb2->getUrls( 'css' ) ); |
|
| 59 | + $jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($path)); |
|
| 60 | + $cssFiles = array_merge($cssFiles, $jsb2->getUrls('css')); |
|
| 61 | 61 | } |
| 62 | 62 | } |
| 63 | 63 | |
| 64 | - $params = array( 'site' => '{site}', 'lang' => '{lang}', 'tab' => '{tab}' ); |
|
| 65 | - $adminUrl = $this->generateUrl( 'aimeos_shop_extadm', $params ); |
|
| 64 | + $params = array('site' => '{site}', 'lang' => '{lang}', 'tab' => '{tab}'); |
|
| 65 | + $adminUrl = $this->generateUrl('aimeos_shop_extadm', $params); |
|
| 66 | 66 | |
| 67 | - $token = $this->get( 'security.csrf.token_manager' )->getToken( 'aimeos_admin_token' )->getValue(); |
|
| 68 | - $jsonUrl = $this->generateUrl( 'aimeos_shop_extadm_json', array( '_token' => $token, 'site' => $site ) ); |
|
| 67 | + $token = $this->get('security.csrf.token_manager')->getToken('aimeos_admin_token')->getValue(); |
|
| 68 | + $jsonUrl = $this->generateUrl('aimeos_shop_extadm_json', array('_token' => $token, 'site' => $site)); |
|
| 69 | 69 | |
| 70 | - $jqadmUrl = $this->generateUrl( 'aimeos_shop_jqadm_search', array( 'site' => $site, 'resource' => 'product' ) ); |
|
| 70 | + $jqadmUrl = $this->generateUrl('aimeos_shop_jqadm_search', array('site' => $site, 'resource' => 'product')); |
|
| 71 | 71 | |
| 72 | 72 | $vars = array( |
| 73 | 73 | 'lang' => $lang, |
| 74 | 74 | 'cssFiles' => $cssFiles, |
| 75 | 75 | 'languages' => $this->getJsonLanguages(), |
| 76 | - 'config' => $this->getJsonClientConfig( $context ), |
|
| 77 | - 'site' => $this->getJsonSiteItem( $context, $site ), |
|
| 78 | - 'i18nContent' => $this->getJsonClientI18n( $bootstrap->getI18nPaths(), $lang ), |
|
| 76 | + 'config' => $this->getJsonClientConfig($context), |
|
| 77 | + 'site' => $this->getJsonSiteItem($context, $site), |
|
| 78 | + 'i18nContent' => $this->getJsonClientI18n($bootstrap->getI18nPaths(), $lang), |
|
| 79 | 79 | 'searchSchemas' => $controller->getJsonSearchSchemas(), |
| 80 | 80 | 'itemSchemas' => $controller->getJsonItemSchemas(), |
| 81 | - 'smd' => $controller->getJsonSmd( $jsonUrl ), |
|
| 82 | - 'urlTemplate' => urldecode( $adminUrl ), |
|
| 83 | - 'uploaddir' => $this->container->getParameter( 'aimeos_shop.uploaddir' ), |
|
| 81 | + 'smd' => $controller->getJsonSmd($jsonUrl), |
|
| 82 | + 'urlTemplate' => urldecode($adminUrl), |
|
| 83 | + 'uploaddir' => $this->container->getParameter('aimeos_shop.uploaddir'), |
|
| 84 | 84 | 'version' => $aimeos->getVersion(), |
| 85 | 85 | 'jqadmurl' => $jqadmUrl, |
| 86 | 86 | 'activeTab' => $tab, |
| 87 | 87 | ); |
| 88 | 88 | |
| 89 | - return $this->render( 'AimeosShopBundle:Extadm:index.html.twig', $vars ); |
|
| 89 | + return $this->render('AimeosShopBundle:Extadm:index.html.twig', $vars); |
|
| 90 | 90 | } |
| 91 | 91 | |
| 92 | 92 | |
@@ -96,23 +96,23 @@ discard block |
||
| 96 | 96 | * @param Request $request Symfony request object |
| 97 | 97 | * @return Response JSON RPC message response |
| 98 | 98 | */ |
| 99 | - public function doAction( Request $request ) |
|
| 99 | + public function doAction(Request $request) |
|
| 100 | 100 | { |
| 101 | 101 | $csrfProvider = $this->get('security.csrf.token_manager'); |
| 102 | 102 | |
| 103 | - if( $csrfProvider->isTokenValid( new CsrfToken( 'aimeos_admin_token', $request->query->get( '_token' ) ) ) !== true ) { |
|
| 104 | - throw new \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException( 'CSRF token is invalid' ); |
|
| 103 | + if ($csrfProvider->isTokenValid(new CsrfToken('aimeos_admin_token', $request->query->get('_token'))) !== true) { |
|
| 104 | + throw new \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException('CSRF token is invalid'); |
|
| 105 | 105 | } |
| 106 | 106 | |
| 107 | - $cntlPaths = $this->get( 'aimeos' )->get()->getCustomPaths( 'controller/extjs' ); |
|
| 108 | - $context = $this->get( 'aimeos_context' )->get( false, 'backend' ); |
|
| 109 | - $context->setView( $this->get( 'aimeos_view' )->create( $context, array() ) ); |
|
| 110 | - $context->setLocale( $this->get( 'aimeos_locale' )->getBackend( $context, 'default' ) ); |
|
| 107 | + $cntlPaths = $this->get('aimeos')->get()->getCustomPaths('controller/extjs'); |
|
| 108 | + $context = $this->get('aimeos_context')->get(false, 'backend'); |
|
| 109 | + $context->setView($this->get('aimeos_view')->create($context, array())); |
|
| 110 | + $context->setLocale($this->get('aimeos_locale')->getBackend($context, 'default')); |
|
| 111 | 111 | |
| 112 | - $controller = new \Aimeos\Controller\ExtJS\JsonRpc( $context, $cntlPaths ); |
|
| 112 | + $controller = new \Aimeos\Controller\ExtJS\JsonRpc($context, $cntlPaths); |
|
| 113 | 113 | |
| 114 | - $response = $controller->process( $request->request->all(), $request->getContent() ); |
|
| 115 | - return $this->render( 'AimeosShopBundle:Extadm:do.html.twig', array( 'output' => $response ) ); |
|
| 114 | + $response = $controller->process($request->request->all(), $request->getContent()); |
|
| 115 | + return $this->render('AimeosShopBundle:Extadm:do.html.twig', array('output' => $response)); |
|
| 116 | 116 | } |
| 117 | 117 | |
| 118 | 118 | |
@@ -125,27 +125,27 @@ discard block |
||
| 125 | 125 | { |
| 126 | 126 | $contents = ''; |
| 127 | 127 | $jsFiles = array(); |
| 128 | - $aimeos = $this->get( 'aimeos' )->get(); |
|
| 128 | + $aimeos = $this->get('aimeos')->get(); |
|
| 129 | 129 | |
| 130 | - foreach( $aimeos->getCustomPaths( 'admin/extjs' ) as $base => $paths ) |
|
| 130 | + foreach ($aimeos->getCustomPaths('admin/extjs') as $base => $paths) |
|
| 131 | 131 | { |
| 132 | - foreach( $paths as $path ) |
|
| 132 | + foreach ($paths as $path) |
|
| 133 | 133 | { |
| 134 | - $jsbAbsPath = $base . '/' . $path; |
|
| 135 | - $jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $jsbAbsPath ) ); |
|
| 136 | - $jsFiles = array_merge( $jsFiles, $jsb2->getFiles( 'js' ) ); |
|
| 134 | + $jsbAbsPath = $base.'/'.$path; |
|
| 135 | + $jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($jsbAbsPath)); |
|
| 136 | + $jsFiles = array_merge($jsFiles, $jsb2->getFiles('js')); |
|
| 137 | 137 | } |
| 138 | 138 | } |
| 139 | 139 | |
| 140 | - foreach( $jsFiles as $file ) |
|
| 140 | + foreach ($jsFiles as $file) |
|
| 141 | 141 | { |
| 142 | - if( ( $content = file_get_contents( $file ) ) !== false ) { |
|
| 142 | + if (($content = file_get_contents($file)) !== false) { |
|
| 143 | 143 | $contents .= $content; |
| 144 | 144 | } |
| 145 | 145 | } |
| 146 | 146 | |
| 147 | - $response = new Response( $contents ); |
|
| 148 | - $response->headers->set( 'Content-Type', 'application/javascript' ); |
|
| 147 | + $response = new Response($contents); |
|
| 148 | + $response->headers->set('Content-Type', 'application/javascript'); |
|
| 149 | 149 | |
| 150 | 150 | return $response; |
| 151 | 151 | } |
@@ -160,11 +160,11 @@ discard block |
||
| 160 | 160 | { |
| 161 | 161 | $result = array(); |
| 162 | 162 | |
| 163 | - foreach( $this->get( 'aimeos' )->get()->getI18nList( 'admin' ) as $id ) { |
|
| 164 | - $result[] = array( 'id' => $id, 'label' => $id ); |
|
| 163 | + foreach ($this->get('aimeos')->get()->getI18nList('admin') as $id) { |
|
| 164 | + $result[] = array('id' => $id, 'label' => $id); |
|
| 165 | 165 | } |
| 166 | 166 | |
| 167 | - return json_encode( $result ); |
|
| 167 | + return json_encode($result); |
|
| 168 | 168 | } |
| 169 | 169 | |
| 170 | 170 | |
@@ -174,10 +174,10 @@ discard block |
||
| 174 | 174 | * @param \Aimeos\MShop\Context\Item\Iface $context Context item object |
| 175 | 175 | * @return string JSON encoded configuration object |
| 176 | 176 | */ |
| 177 | - protected function getJsonClientConfig( \Aimeos\MShop\Context\Item\Iface $context ) |
|
| 177 | + protected function getJsonClientConfig(\Aimeos\MShop\Context\Item\Iface $context) |
|
| 178 | 178 | { |
| 179 | - $config = $context->getConfig()->get( 'admin/extjs', array() ); |
|
| 180 | - return json_encode( array( 'admin' => array( 'extjs' => $config ) ), JSON_FORCE_OBJECT ); |
|
| 179 | + $config = $context->getConfig()->get('admin/extjs', array()); |
|
| 180 | + return json_encode(array('admin' => array('extjs' => $config)), JSON_FORCE_OBJECT); |
|
| 181 | 181 | } |
| 182 | 182 | |
| 183 | 183 | |
@@ -188,16 +188,16 @@ discard block |
||
| 188 | 188 | * @param string $lang ISO language code like "en" or "en_GB" |
| 189 | 189 | * @return string JSON encoded translation object |
| 190 | 190 | */ |
| 191 | - protected function getJsonClientI18n( array $i18nPaths, $lang ) |
|
| 191 | + protected function getJsonClientI18n(array $i18nPaths, $lang) |
|
| 192 | 192 | { |
| 193 | - $i18n = new \Aimeos\MW\Translation\Gettext( $i18nPaths, $lang ); |
|
| 193 | + $i18n = new \Aimeos\MW\Translation\Gettext($i18nPaths, $lang); |
|
| 194 | 194 | |
| 195 | 195 | $content = array( |
| 196 | - 'admin' => $i18n->getAll( 'admin' ), |
|
| 197 | - 'admin/ext' => $i18n->getAll( 'admin/ext' ), |
|
| 196 | + 'admin' => $i18n->getAll('admin'), |
|
| 197 | + 'admin/ext' => $i18n->getAll('admin/ext'), |
|
| 198 | 198 | ); |
| 199 | 199 | |
| 200 | - return json_encode( $content, JSON_FORCE_OBJECT ); |
|
| 200 | + return json_encode($content, JSON_FORCE_OBJECT); |
|
| 201 | 201 | } |
| 202 | 202 | |
| 203 | 203 | |
@@ -209,18 +209,18 @@ discard block |
||
| 209 | 209 | * @return string JSON encoded site item object |
| 210 | 210 | * @throws Exception If no site item was found for the code |
| 211 | 211 | */ |
| 212 | - protected function getJsonSiteItem( \Aimeos\MShop\Context\Item\Iface $context, $site ) |
|
| 212 | + protected function getJsonSiteItem(\Aimeos\MShop\Context\Item\Iface $context, $site) |
|
| 213 | 213 | { |
| 214 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'locale/site' ); |
|
| 214 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'locale/site'); |
|
| 215 | 215 | |
| 216 | 216 | $criteria = $manager->createSearch(); |
| 217 | - $criteria->setConditions( $criteria->compare( '==', 'locale.site.code', $site ) ); |
|
| 218 | - $items = $manager->searchItems( $criteria ); |
|
| 217 | + $criteria->setConditions($criteria->compare('==', 'locale.site.code', $site)); |
|
| 218 | + $items = $manager->searchItems($criteria); |
|
| 219 | 219 | |
| 220 | - if( ( $item = reset( $items ) ) === false ) { |
|
| 221 | - throw new \Exception( sprintf( 'No site found for code "%1$s"', $site ) ); |
|
| 220 | + if (($item = reset($items)) === false) { |
|
| 221 | + throw new \Exception(sprintf('No site found for code "%1$s"', $site)); |
|
| 222 | 222 | } |
| 223 | 223 | |
| 224 | - return json_encode( $item->toArray() ); |
|
| 224 | + return json_encode($item->toArray()); |
|
| 225 | 225 | } |
| 226 | 226 | } |
@@ -29,35 +29,35 @@ discard block |
||
| 29 | 29 | * @param $type File type, i.e. "css" or "js" |
| 30 | 30 | * @return Response Response object |
| 31 | 31 | */ |
| 32 | - public function fileAction( $type ) |
|
| 32 | + public function fileAction($type) |
|
| 33 | 33 | { |
| 34 | 34 | $contents = ''; |
| 35 | 35 | $files = array(); |
| 36 | - $aimeos = $this->get( 'aimeos' )->get(); |
|
| 36 | + $aimeos = $this->get('aimeos')->get(); |
|
| 37 | 37 | |
| 38 | - foreach( $aimeos->getCustomPaths( 'admin/jqadm' ) as $base => $paths ) |
|
| 38 | + foreach ($aimeos->getCustomPaths('admin/jqadm') as $base => $paths) |
|
| 39 | 39 | { |
| 40 | - foreach( $paths as $path ) |
|
| 40 | + foreach ($paths as $path) |
|
| 41 | 41 | { |
| 42 | - $jsbAbsPath = $base . '/' . $path; |
|
| 43 | - $jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $jsbAbsPath ) ); |
|
| 44 | - $files = array_merge( $files, $jsb2->getFiles( $type ) ); |
|
| 42 | + $jsbAbsPath = $base.'/'.$path; |
|
| 43 | + $jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($jsbAbsPath)); |
|
| 44 | + $files = array_merge($files, $jsb2->getFiles($type)); |
|
| 45 | 45 | } |
| 46 | 46 | } |
| 47 | 47 | |
| 48 | - foreach( $files as $file ) |
|
| 48 | + foreach ($files as $file) |
|
| 49 | 49 | { |
| 50 | - if( ( $content = file_get_contents( $file ) ) !== false ) { |
|
| 50 | + if (($content = file_get_contents($file)) !== false) { |
|
| 51 | 51 | $contents .= $content; |
| 52 | 52 | } |
| 53 | 53 | } |
| 54 | 54 | |
| 55 | - $response = new Response( $contents ); |
|
| 55 | + $response = new Response($contents); |
|
| 56 | 56 | |
| 57 | - if( $type === 'js' ) { |
|
| 58 | - $response->headers->set( 'Content-Type', 'application/javascript' ); |
|
| 59 | - } elseif( $type === 'css' ) { |
|
| 60 | - $response->headers->set( 'Content-Type', 'text/css' ); |
|
| 57 | + if ($type === 'js') { |
|
| 58 | + $response->headers->set('Content-Type', 'application/javascript'); |
|
| 59 | + } elseif ($type === 'css') { |
|
| 60 | + $response->headers->set('Content-Type', 'text/css'); |
|
| 61 | 61 | } |
| 62 | 62 | |
| 63 | 63 | return $response; |
@@ -72,10 +72,10 @@ discard block |
||
| 72 | 72 | * @param string $site Unique site code |
| 73 | 73 | * @return Response Generated output |
| 74 | 74 | */ |
| 75 | - public function copyAction( Request $request, $resource, $site = 'default' ) |
|
| 75 | + public function copyAction(Request $request, $resource, $site = 'default') |
|
| 76 | 76 | { |
| 77 | - $cntl = $this->createClient( $request, $site, $resource ); |
|
| 78 | - return $this->getHtml( $cntl->copy() ); |
|
| 77 | + $cntl = $this->createClient($request, $site, $resource); |
|
| 78 | + return $this->getHtml($cntl->copy()); |
|
| 79 | 79 | } |
| 80 | 80 | |
| 81 | 81 | |
@@ -87,10 +87,10 @@ discard block |
||
| 87 | 87 | * @param string $site Unique site code |
| 88 | 88 | * @return Response Generated output |
| 89 | 89 | */ |
| 90 | - public function createAction( Request $request, $resource, $site = 'default' ) |
|
| 90 | + public function createAction(Request $request, $resource, $site = 'default') |
|
| 91 | 91 | { |
| 92 | - $cntl = $this->createClient( $request, $site, $resource ); |
|
| 93 | - return $this->getHtml( $cntl->create() ); |
|
| 92 | + $cntl = $this->createClient($request, $site, $resource); |
|
| 93 | + return $this->getHtml($cntl->create()); |
|
| 94 | 94 | } |
| 95 | 95 | |
| 96 | 96 | |
@@ -102,10 +102,10 @@ discard block |
||
| 102 | 102 | * @param string $site Unique site code |
| 103 | 103 | * @return Response Generated output |
| 104 | 104 | */ |
| 105 | - public function deleteAction( Request $request, $resource, $site = 'default' ) |
|
| 105 | + public function deleteAction(Request $request, $resource, $site = 'default') |
|
| 106 | 106 | { |
| 107 | - $cntl = $this->createClient( $request, $site, $resource ); |
|
| 108 | - return $this->getHtml( $cntl->delete() . $cntl->search() ); |
|
| 107 | + $cntl = $this->createClient($request, $site, $resource); |
|
| 108 | + return $this->getHtml($cntl->delete().$cntl->search()); |
|
| 109 | 109 | } |
| 110 | 110 | |
| 111 | 111 | |
@@ -117,10 +117,10 @@ discard block |
||
| 117 | 117 | * @param string $site Unique site code |
| 118 | 118 | * @return Response Generated output |
| 119 | 119 | */ |
| 120 | - public function getAction( Request $request, $resource, $site = 'default' ) |
|
| 120 | + public function getAction(Request $request, $resource, $site = 'default') |
|
| 121 | 121 | { |
| 122 | - $cntl = $this->createClient( $request, $site, $resource ); |
|
| 123 | - return $this->getHtml( $cntl->get() ); |
|
| 122 | + $cntl = $this->createClient($request, $site, $resource); |
|
| 123 | + return $this->getHtml($cntl->get()); |
|
| 124 | 124 | } |
| 125 | 125 | |
| 126 | 126 | |
@@ -132,10 +132,10 @@ discard block |
||
| 132 | 132 | * @param string $site Unique site code |
| 133 | 133 | * @return Response Generated output |
| 134 | 134 | */ |
| 135 | - public function saveAction( Request $request, $resource, $site = 'default' ) |
|
| 135 | + public function saveAction(Request $request, $resource, $site = 'default') |
|
| 136 | 136 | { |
| 137 | - $cntl = $this->createClient( $request, $site, $resource ); |
|
| 138 | - return $this->getHtml( ( $cntl->save() ? : $cntl->search() ) ); |
|
| 137 | + $cntl = $this->createClient($request, $site, $resource); |
|
| 138 | + return $this->getHtml(($cntl->save() ?: $cntl->search())); |
|
| 139 | 139 | } |
| 140 | 140 | |
| 141 | 141 | |
@@ -147,10 +147,10 @@ discard block |
||
| 147 | 147 | * @param string $site Unique site code |
| 148 | 148 | * @return Response Generated output |
| 149 | 149 | */ |
| 150 | - public function searchAction( Request $request, $resource, $site = 'default' ) |
|
| 150 | + public function searchAction(Request $request, $resource, $site = 'default') |
|
| 151 | 151 | { |
| 152 | - $cntl = $this->createClient( $request, $site, $resource ); |
|
| 153 | - return $this->getHtml( $cntl->search() ); |
|
| 152 | + $cntl = $this->createClient($request, $site, $resource); |
|
| 153 | + return $this->getHtml($cntl->search()); |
|
| 154 | 154 | } |
| 155 | 155 | |
| 156 | 156 | |
@@ -162,21 +162,21 @@ discard block |
||
| 162 | 162 | * @param string $resource Resource location, e.g. "product" |
| 163 | 163 | * @return \Aimeos\Admin\JQAdm\Iface Context item |
| 164 | 164 | */ |
| 165 | - protected function createClient( Request $request, $site, $resource ) |
|
| 165 | + protected function createClient(Request $request, $site, $resource) |
|
| 166 | 166 | { |
| 167 | - $lang = $request->get( 'lang', 'en' ); |
|
| 167 | + $lang = $request->get('lang', 'en'); |
|
| 168 | 168 | |
| 169 | - $aimeos = $this->get( 'aimeos' )->get(); |
|
| 170 | - $templatePaths = $aimeos->getCustomPaths( 'admin/jqadm/templates' ); |
|
| 169 | + $aimeos = $this->get('aimeos')->get(); |
|
| 170 | + $templatePaths = $aimeos->getCustomPaths('admin/jqadm/templates'); |
|
| 171 | 171 | |
| 172 | - $context = $this->get( 'aimeos_context' )->get( false, 'backend' ); |
|
| 173 | - $context->setI18n( $this->get( 'aimeos_i18n' )->get( array( $lang, 'en' ) ) ); |
|
| 174 | - $context->setLocale( $this->get( 'aimeos_locale' )->getBackend( $context, $site ) ); |
|
| 172 | + $context = $this->get('aimeos_context')->get(false, 'backend'); |
|
| 173 | + $context->setI18n($this->get('aimeos_i18n')->get(array($lang, 'en'))); |
|
| 174 | + $context->setLocale($this->get('aimeos_locale')->getBackend($context, $site)); |
|
| 175 | 175 | |
| 176 | - $view = $this->get( 'aimeos_view' )->create( $context, $templatePaths, $lang ); |
|
| 177 | - $context->setView( $view ); |
|
| 176 | + $view = $this->get('aimeos_view')->create($context, $templatePaths, $lang); |
|
| 177 | + $context->setView($view); |
|
| 178 | 178 | |
| 179 | - return \Aimeos\Admin\JQAdm\Factory::createClient( $context, $templatePaths, $resource ); |
|
| 179 | + return \Aimeos\Admin\JQAdm\Factory::createClient($context, $templatePaths, $resource); |
|
| 180 | 180 | } |
| 181 | 181 | |
| 182 | 182 | |
@@ -186,11 +186,11 @@ discard block |
||
| 186 | 186 | * @param string $content Content from admin client |
| 187 | 187 | * @return Response View for rendering the output |
| 188 | 188 | */ |
| 189 | - protected function getHtml( $content ) |
|
| 189 | + protected function getHtml($content) |
|
| 190 | 190 | { |
| 191 | - $version = $this->get( 'aimeos' )->getVersion(); |
|
| 192 | - $content = str_replace( array( '{type}', '{version}' ), array( 'Symfony', $version ), $content ); |
|
| 191 | + $version = $this->get('aimeos')->getVersion(); |
|
| 192 | + $content = str_replace(array('{type}', '{version}'), array('Symfony', $version), $content); |
|
| 193 | 193 | |
| 194 | - return $this->render( 'AimeosShopBundle:Jqadm:index.html.twig', array( 'content' => $content ) ); |
|
| 194 | + return $this->render('AimeosShopBundle:Jqadm:index.html.twig', array('content' => $content)); |
|
| 195 | 195 | } |
| 196 | 196 | } |
@@ -28,18 +28,18 @@ discard block |
||
| 28 | 28 | * @param CommandEvent $event CommandEvent instance |
| 29 | 29 | * @throws \RuntimeException If an error occured |
| 30 | 30 | */ |
| 31 | - public static function setupDatabase( CommandEvent $event ) |
|
| 31 | + public static function setupDatabase(CommandEvent $event) |
|
| 32 | 32 | { |
| 33 | 33 | $options = $env = array(); |
| 34 | 34 | |
| 35 | - if( $event->isDevMode() ) { |
|
| 35 | + if ($event->isDevMode()) { |
|
| 36 | 36 | $options[] = '--option=setup/default/demo:1'; |
| 37 | 37 | } else { |
| 38 | 38 | $env[] = '--env=prod'; |
| 39 | 39 | } |
| 40 | 40 | |
| 41 | - self::executeCommand( $event, 'aimeos:setup', $options + $env ); |
|
| 42 | - self::executeCommand( $event, 'aimeos:cache', $env ); |
|
| 41 | + self::executeCommand($event, 'aimeos:setup', $options + $env); |
|
| 42 | + self::executeCommand($event, 'aimeos:cache', $env); |
|
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | |
@@ -49,20 +49,20 @@ discard block |
||
| 49 | 49 | * @param CommandEvent $event CommandEvent instance |
| 50 | 50 | * @throws \RuntimeException If an error occured |
| 51 | 51 | */ |
| 52 | - public static function updateConfig( CommandEvent $event ) |
|
| 52 | + public static function updateConfig(CommandEvent $event) |
|
| 53 | 53 | { |
| 54 | - $event->getIO()->write( 'Ensure existing config and routing for the shop bundle' ); |
|
| 54 | + $event->getIO()->write('Ensure existing config and routing for the shop bundle'); |
|
| 55 | 55 | |
| 56 | - $options = self::getOptions( $event ); |
|
| 56 | + $options = self::getOptions($event); |
|
| 57 | 57 | |
| 58 | - if( !isset( $options['symfony-app-dir'] ) || !is_dir( $options['symfony-app-dir'] ) ) |
|
| 58 | + if (!isset($options['symfony-app-dir']) || !is_dir($options['symfony-app-dir'])) |
|
| 59 | 59 | { |
| 60 | 60 | $msg = 'An error occurred because the "%1$s" option or the "%2$s" directory isn\'t available'; |
| 61 | - throw new \RuntimeException( sprintf( $msg, 'symfony-app-dir', $options['symfony-app-dir'] ) ); |
|
| 61 | + throw new \RuntimeException(sprintf($msg, 'symfony-app-dir', $options['symfony-app-dir'])); |
|
| 62 | 62 | } |
| 63 | 63 | |
| 64 | - self::updateConfigFile( $options['symfony-app-dir'] . '/config/config.yml' ); |
|
| 65 | - self::updateRoutingFile( $options['symfony-app-dir'] . '/config/routing.yml' ); |
|
| 64 | + self::updateConfigFile($options['symfony-app-dir'].'/config/config.yml'); |
|
| 65 | + self::updateRoutingFile($options['symfony-app-dir'].'/config/routing.yml'); |
|
| 66 | 66 | } |
| 67 | 67 | |
| 68 | 68 | |
@@ -72,28 +72,28 @@ discard block |
||
| 72 | 72 | * @param CommandEvent $event CommandEvent instance |
| 73 | 73 | * @throws \RuntimeException If an error occured |
| 74 | 74 | */ |
| 75 | - public static function installBundle( CommandEvent $event ) |
|
| 75 | + public static function installBundle(CommandEvent $event) |
|
| 76 | 76 | { |
| 77 | - $event->getIO()->write( 'Installing the Aimeos shop bundle' ); |
|
| 77 | + $event->getIO()->write('Installing the Aimeos shop bundle'); |
|
| 78 | 78 | |
| 79 | - $options = self::getOptions( $event ); |
|
| 79 | + $options = self::getOptions($event); |
|
| 80 | 80 | |
| 81 | - if( !isset( $options['symfony-app-dir'] ) || !is_dir( $options['symfony-app-dir'] ) ) |
|
| 81 | + if (!isset($options['symfony-app-dir']) || !is_dir($options['symfony-app-dir'])) |
|
| 82 | 82 | { |
| 83 | 83 | $msg = 'An error occurred because the "%1$s" option or the "%2$s" directory isn\'t available'; |
| 84 | - throw new \RuntimeException( sprintf( $msg, 'symfony-app-dir', $options['symfony-app-dir'] ) ); |
|
| 84 | + throw new \RuntimeException(sprintf($msg, 'symfony-app-dir', $options['symfony-app-dir'])); |
|
| 85 | 85 | } |
| 86 | 86 | |
| 87 | - if( !isset( $options['symfony-web-dir'] ) || !is_dir( $options['symfony-web-dir'] ) ) |
|
| 87 | + if (!isset($options['symfony-web-dir']) || !is_dir($options['symfony-web-dir'])) |
|
| 88 | 88 | { |
| 89 | 89 | $msg = 'An error occurred because the "%1$s" option or the "%2$s" directory isn\'t available'; |
| 90 | - throw new \RuntimeException( sprintf( $msg, 'symfony-web-dir', $options['symfony-web-dir'] ) ); |
|
| 90 | + throw new \RuntimeException(sprintf($msg, 'symfony-web-dir', $options['symfony-web-dir'])); |
|
| 91 | 91 | } |
| 92 | 92 | |
| 93 | - self::createDirectory( $options['symfony-app-dir'] . '/secure' ); |
|
| 94 | - self::createDirectory( $options['symfony-web-dir'] . '/uploads' ); |
|
| 95 | - self::createDirectory( $options['symfony-web-dir'] . '/preview' ); |
|
| 96 | - self::createDirectory( $options['symfony-web-dir'] . '/files' ); |
|
| 93 | + self::createDirectory($options['symfony-app-dir'].'/secure'); |
|
| 94 | + self::createDirectory($options['symfony-web-dir'].'/uploads'); |
|
| 95 | + self::createDirectory($options['symfony-web-dir'].'/preview'); |
|
| 96 | + self::createDirectory($options['symfony-web-dir'].'/files'); |
|
| 97 | 97 | } |
| 98 | 98 | |
| 99 | 99 | |
@@ -103,14 +103,14 @@ discard block |
||
| 103 | 103 | * @param string $dir Absolute path of the new directory |
| 104 | 104 | * @throws \RuntimeException If directory couldn't be created |
| 105 | 105 | */ |
| 106 | - protected static function createDirectory( $dir ) |
|
| 106 | + protected static function createDirectory($dir) |
|
| 107 | 107 | { |
| 108 | 108 | $perm = 0755; |
| 109 | 109 | |
| 110 | - if( !is_dir( $dir ) && !mkdir( $dir, $perm, true ) ) |
|
| 110 | + if (!is_dir($dir) && !mkdir($dir, $perm, true)) |
|
| 111 | 111 | { |
| 112 | 112 | $msg = 'Unable to create directory "%1$s" with permission "%2$s"'; |
| 113 | - throw new \RuntimeException( sprintf( $msg, $dir, $perm ) ); |
|
| 113 | + throw new \RuntimeException(sprintf($msg, $dir, $perm)); |
|
| 114 | 114 | } |
| 115 | 115 | } |
| 116 | 116 | |
@@ -123,28 +123,28 @@ discard block |
||
| 123 | 123 | * @param array List of configuration options for the given command |
| 124 | 124 | * @throws \RuntimeException If the command couldn't be executed |
| 125 | 125 | */ |
| 126 | - protected static function executeCommand( CommandEvent $event, $cmd, array $options = array() ) |
|
| 126 | + protected static function executeCommand(CommandEvent $event, $cmd, array $options = array()) |
|
| 127 | 127 | { |
| 128 | - $php = escapeshellarg( self::getPhp() ); |
|
| 129 | - $console = escapeshellarg( self::getConsoleDir( $event ) . '/console' ); |
|
| 130 | - $cmd = escapeshellarg( $cmd ); |
|
| 128 | + $php = escapeshellarg(self::getPhp()); |
|
| 129 | + $console = escapeshellarg(self::getConsoleDir($event).'/console'); |
|
| 130 | + $cmd = escapeshellarg($cmd); |
|
| 131 | 131 | |
| 132 | - foreach( $options as $key => $option ) { |
|
| 133 | - $options[$key] = escapeshellarg( $option ); |
|
| 132 | + foreach ($options as $key => $option) { |
|
| 133 | + $options[$key] = escapeshellarg($option); |
|
| 134 | 134 | } |
| 135 | 135 | |
| 136 | - if( $event->getIO()->isDecorated() ) { |
|
| 136 | + if ($event->getIO()->isDecorated()) { |
|
| 137 | 137 | $console .= ' --ansi'; |
| 138 | 138 | } |
| 139 | 139 | |
| 140 | - $process = new Process( $php . ' ' . $console . ' ' . $cmd . ' ' . implode( ' ', $options ), null, null, null, 3600 ); |
|
| 140 | + $process = new Process($php.' '.$console.' '.$cmd.' '.implode(' ', $options), null, null, null, 3600); |
|
| 141 | 141 | |
| 142 | - $process->run( function( $type, $buffer ) use ( $event ) { |
|
| 143 | - $event->getIO()->write( $buffer, false ); |
|
| 142 | + $process->run(function($type, $buffer) use ($event) { |
|
| 143 | + $event->getIO()->write($buffer, false); |
|
| 144 | 144 | } ); |
| 145 | 145 | |
| 146 | - if( !$process->isSuccessful() ) { |
|
| 147 | - throw new \RuntimeException( sprintf( 'An error occurred when executing the "%s" command', escapeshellarg( $cmd ) ) ); |
|
| 146 | + if (!$process->isSuccessful()) { |
|
| 147 | + throw new \RuntimeException(sprintf('An error occurred when executing the "%s" command', escapeshellarg($cmd))); |
|
| 148 | 148 | } |
| 149 | 149 | } |
| 150 | 150 | |
@@ -157,19 +157,19 @@ discard block |
||
| 157 | 157 | * @return string The path to the console directory |
| 158 | 158 | * @throws \RuntimeException If console directory couldn't be found |
| 159 | 159 | */ |
| 160 | - protected static function getConsoleDir( CommandEvent $event ) |
|
| 160 | + protected static function getConsoleDir(CommandEvent $event) |
|
| 161 | 161 | { |
| 162 | - $options = self::getOptions( $event ); |
|
| 162 | + $options = self::getOptions($event); |
|
| 163 | 163 | |
| 164 | - if( isset( $options['symfony-bin-dir'] ) && is_dir( $options['symfony-bin-dir'] ) ) { |
|
| 164 | + if (isset($options['symfony-bin-dir']) && is_dir($options['symfony-bin-dir'])) { |
|
| 165 | 165 | return $options['symfony-bin-dir']; |
| 166 | 166 | } |
| 167 | 167 | |
| 168 | - if( isset( $options['symfony-app-dir'] ) && is_dir( $options['symfony-app-dir'] ) ) { |
|
| 168 | + if (isset($options['symfony-app-dir']) && is_dir($options['symfony-app-dir'])) { |
|
| 169 | 169 | return $options['symfony-app-dir']; |
| 170 | 170 | } |
| 171 | 171 | |
| 172 | - throw new \RuntimeException( sprintf( 'Console directory not found. Neither %1$s nor %2$s option exist', 'symfony-app-dir', 'symfony-bin-dir' ) ); |
|
| 172 | + throw new \RuntimeException(sprintf('Console directory not found. Neither %1$s nor %2$s option exist', 'symfony-app-dir', 'symfony-bin-dir')); |
|
| 173 | 173 | } |
| 174 | 174 | |
| 175 | 175 | |
@@ -179,7 +179,7 @@ discard block |
||
| 179 | 179 | * @param CommandEvent $event Command event object |
| 180 | 180 | * @return array Associative list of option keys and values |
| 181 | 181 | */ |
| 182 | - protected static function getOptions( CommandEvent $event ) |
|
| 182 | + protected static function getOptions(CommandEvent $event) |
|
| 183 | 183 | { |
| 184 | 184 | return $event->getComposer()->getPackage()->getExtra(); |
| 185 | 185 | } |
@@ -195,8 +195,8 @@ discard block |
||
| 195 | 195 | { |
| 196 | 196 | $phpFinder = new PhpExecutableFinder; |
| 197 | 197 | |
| 198 | - if( !( $phpPath = $phpFinder->find() ) ) { |
|
| 199 | - throw new \RuntimeException( 'The php executable could not be found, add it to your PATH environment variable and try again' ); |
|
| 198 | + if (!($phpPath = $phpFinder->find())) { |
|
| 199 | + throw new \RuntimeException('The php executable could not be found, add it to your PATH environment variable and try again'); |
|
| 200 | 200 | } |
| 201 | 201 | |
| 202 | 202 | return $phpPath; |
@@ -209,15 +209,15 @@ discard block |
||
| 209 | 209 | * @param string $filename Name of the YAML config file |
| 210 | 210 | * @throws \RuntimeException If file is not found |
| 211 | 211 | */ |
| 212 | - protected static function updateConfigFile( $filename ) |
|
| 212 | + protected static function updateConfigFile($filename) |
|
| 213 | 213 | { |
| 214 | - if( ( $content = file_get_contents( $filename ) ) === false ) { |
|
| 215 | - throw new \RuntimeException( sprintf( 'File "%1$s" not found', $filename ) ); |
|
| 214 | + if (($content = file_get_contents($filename)) === false) { |
|
| 215 | + throw new \RuntimeException(sprintf('File "%1$s" not found', $filename)); |
|
| 216 | 216 | } |
| 217 | 217 | |
| 218 | - if( self::addAsseticBundle( $content ) === true ) { |
|
| 218 | + if (self::addAsseticBundle($content) === true) { |
|
| 219 | 219 | $fs = new Filesystem(); |
| 220 | - $fs->dumpFile( $filename, $content ); |
|
| 220 | + $fs->dumpFile($filename, $content); |
|
| 221 | 221 | } |
| 222 | 222 | } |
| 223 | 223 | |
@@ -228,36 +228,36 @@ discard block |
||
| 228 | 228 | * @param string $filename Name of the YAML config file |
| 229 | 229 | * @throws \RuntimeException If file is not found |
| 230 | 230 | */ |
| 231 | - protected static function updateRoutingFile( $filename ) |
|
| 231 | + protected static function updateRoutingFile($filename) |
|
| 232 | 232 | { |
| 233 | 233 | $update = false; |
| 234 | 234 | |
| 235 | - if( ( $content = file_get_contents( $filename ) ) === false ) { |
|
| 236 | - throw new \RuntimeException( sprintf( 'File "%1$s" not found', $filename ) ); |
|
| 235 | + if (($content = file_get_contents($filename)) === false) { |
|
| 236 | + throw new \RuntimeException(sprintf('File "%1$s" not found', $filename)); |
|
| 237 | 237 | } |
| 238 | 238 | |
| 239 | - if( strpos( $content, 'aimeos_shop:' ) === false ) |
|
| 239 | + if (strpos($content, 'aimeos_shop:') === false) |
|
| 240 | 240 | { |
| 241 | - $content .= "\n" . 'aimeos_shop: |
|
| 241 | + $content .= "\n".'aimeos_shop: |
|
| 242 | 242 | resource: "@AimeosShopBundle/Resources/config/routing.yml" |
| 243 | 243 | prefix: /'; |
| 244 | 244 | |
| 245 | 245 | $update = true; |
| 246 | 246 | } |
| 247 | 247 | |
| 248 | - if( strpos( $content, 'aimeos_shop_adm:' ) === false ) |
|
| 248 | + if (strpos($content, 'aimeos_shop_adm:') === false) |
|
| 249 | 249 | { |
| 250 | - $content .= "\n" . 'aimeos_shop_adm: |
|
| 250 | + $content .= "\n".'aimeos_shop_adm: |
|
| 251 | 251 | resource: "@AimeosShopBundle/Resources/config/routing_adm.yml" |
| 252 | 252 | prefix: /'; |
| 253 | 253 | |
| 254 | 254 | $update = true; |
| 255 | 255 | } |
| 256 | 256 | |
| 257 | - if( $update === true ) |
|
| 257 | + if ($update === true) |
|
| 258 | 258 | { |
| 259 | 259 | $fs = new Filesystem(); |
| 260 | - $fs->dumpFile( $filename, $content ); |
|
| 260 | + $fs->dumpFile($filename, $content); |
|
| 261 | 261 | } |
| 262 | 262 | } |
| 263 | 263 | |
@@ -268,14 +268,14 @@ discard block |
||
| 268 | 268 | * @param string &$content Content of the config.yml file |
| 269 | 269 | * @return boolean True if modified, false if not |
| 270 | 270 | */ |
| 271 | - protected static function addAsseticBundle( &$content ) |
|
| 271 | + protected static function addAsseticBundle(&$content) |
|
| 272 | 272 | { |
| 273 | - if( preg_match( "/ bundles:[ ]*\[.*'AimeosShopBundle'.*\]/", $content ) !== 1 ) |
|
| 273 | + if (preg_match("/ bundles:[ ]*\[.*'AimeosShopBundle'.*\]/", $content) !== 1) |
|
| 274 | 274 | { |
| 275 | - $search = array( "/ bundles:[ ]*\[([^\]]+)\]/", "/ bundles:[ ]*\[([ ]*)\]/" ); |
|
| 276 | - $replace = array( " bundles: [$1,'AimeosShopBundle']", " bundles: ['AimeosShopBundle']" ); |
|
| 275 | + $search = array("/ bundles:[ ]*\[([^\]]+)\]/", "/ bundles:[ ]*\[([ ]*)\]/"); |
|
| 276 | + $replace = array(" bundles: [$1,'AimeosShopBundle']", " bundles: ['AimeosShopBundle']"); |
|
| 277 | 277 | |
| 278 | - if( ( $content = preg_replace( $search, $replace, $content ) ) !== null ) { |
|
| 278 | + if (($content = preg_replace($search, $replace, $content)) !== null) { |
|
| 279 | 279 | return true; |
| 280 | 280 | } |
| 281 | 281 | } |