@@ -28,6 +28,6 @@ |
||
| 28 | 28 | */ |
| 29 | 29 | public function selectComponentAction() |
| 30 | 30 | { |
| 31 | - return $this->getOutput( 'locale/select' ); |
|
| 31 | + return $this->getOutput('locale/select'); |
|
| 32 | 32 | } |
| 33 | 33 | } |
@@ -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 | |
@@ -29,26 +29,26 @@ |
||
| 29 | 29 | public function getConfigTreeBuilder() |
| 30 | 30 | { |
| 31 | 31 | $treeBuilder = new TreeBuilder(); |
| 32 | - $rootNode = $treeBuilder->root( 'aimeos_shop' ); |
|
| 32 | + $rootNode = $treeBuilder->root('aimeos_shop'); |
|
| 33 | 33 | |
| 34 | 34 | $rootNode |
| 35 | 35 | ->children() |
| 36 | - ->booleanNode('disable_sites')->defaultValue( true )->end() |
|
| 37 | - ->booleanNode('apc_enable')->defaultValue( false )->end() |
|
| 38 | - ->scalarNode('apc_prefix')->defaultValue( 'sf2:' )->end() |
|
| 36 | + ->booleanNode('disable_sites')->defaultValue(true)->end() |
|
| 37 | + ->booleanNode('apc_enable')->defaultValue(false)->end() |
|
| 38 | + ->scalarNode('apc_prefix')->defaultValue('sf2:')->end() |
|
| 39 | 39 | ->scalarNode('extdir')->end() |
| 40 | 40 | ->scalarNode('uploaddir')->end() |
| 41 | - ->variableNode('admin')->defaultValue( array() )->end() |
|
| 42 | - ->variableNode('client')->defaultValue( array() )->end() |
|
| 43 | - ->variableNode('controller')->defaultValue( array() )->end() |
|
| 44 | - ->variableNode('i18n')->defaultValue( array() )->end() |
|
| 45 | - ->variableNode('madmin')->defaultValue( array() )->end() |
|
| 46 | - ->variableNode('mshop')->defaultValue( array() )->end() |
|
| 47 | - ->variableNode('resource')->defaultValue( array() )->end() |
|
| 48 | - ->variableNode('page')->defaultValue( array() )->end() |
|
| 49 | - ->variableNode('backend')->defaultValue( array() )->end() |
|
| 50 | - ->variableNode('frontend')->defaultValue( array() )->end() |
|
| 51 | - ->variableNode('command')->defaultValue( array() )->end() |
|
| 41 | + ->variableNode('admin')->defaultValue(array())->end() |
|
| 42 | + ->variableNode('client')->defaultValue(array())->end() |
|
| 43 | + ->variableNode('controller')->defaultValue(array())->end() |
|
| 44 | + ->variableNode('i18n')->defaultValue(array())->end() |
|
| 45 | + ->variableNode('madmin')->defaultValue(array())->end() |
|
| 46 | + ->variableNode('mshop')->defaultValue(array())->end() |
|
| 47 | + ->variableNode('resource')->defaultValue(array())->end() |
|
| 48 | + ->variableNode('page')->defaultValue(array())->end() |
|
| 49 | + ->variableNode('backend')->defaultValue(array())->end() |
|
| 50 | + ->variableNode('frontend')->defaultValue(array())->end() |
|
| 51 | + ->variableNode('command')->defaultValue(array())->end() |
|
| 52 | 52 | ->end() |
| 53 | 53 | ; |
| 54 | 54 | |
@@ -29,13 +29,13 @@ discard block |
||
| 29 | 29 | */ |
| 30 | 30 | protected function configure() |
| 31 | 31 | { |
| 32 | - $this->setName( 'aimeos:setup'); |
|
| 33 | - $this->setDescription( 'Initialize or update the Aimeos database tables' ); |
|
| 34 | - $this->addArgument( 'site', InputArgument::OPTIONAL, 'Site for updating database entries', 'default' ); |
|
| 35 | - $this->addArgument( 'tplsite', InputArgument::OPTIONAL, 'Template site for creating or updating database entries', 'default' ); |
|
| 36 | - $this->addOption( 'option', null, InputOption::VALUE_REQUIRED, 'Optional setup configuration, name and value are separated by ":" like "setup/default/demo:1"', array() ); |
|
| 37 | - $this->addOption( 'action', null, InputOption::VALUE_REQUIRED, 'Action name that should be executed, i.e. "migrate", "rollback", "clean"', 'migrate' ); |
|
| 38 | - $this->addOption( 'task', null, InputOption::VALUE_REQUIRED, 'Name of the setup task that should be executed', null ); |
|
| 32 | + $this->setName('aimeos:setup'); |
|
| 33 | + $this->setDescription('Initialize or update the Aimeos database tables'); |
|
| 34 | + $this->addArgument('site', InputArgument::OPTIONAL, 'Site for updating database entries', 'default'); |
|
| 35 | + $this->addArgument('tplsite', InputArgument::OPTIONAL, 'Template site for creating or updating database entries', 'default'); |
|
| 36 | + $this->addOption('option', null, InputOption::VALUE_REQUIRED, 'Optional setup configuration, name and value are separated by ":" like "setup/default/demo:1"', array()); |
|
| 37 | + $this->addOption('action', null, InputOption::VALUE_REQUIRED, 'Action name that should be executed, i.e. "migrate", "rollback", "clean"', 'migrate'); |
|
| 38 | + $this->addOption('task', null, InputOption::VALUE_REQUIRED, 'Name of the setup task that should be executed', null); |
|
| 39 | 39 | } |
| 40 | 40 | |
| 41 | 41 | |
@@ -45,41 +45,41 @@ discard block |
||
| 45 | 45 | * @param InputInterface $input Input object |
| 46 | 46 | * @param OutputInterface $output Output object |
| 47 | 47 | */ |
| 48 | - protected function execute( InputInterface $input, OutputInterface $output ) |
|
| 48 | + protected function execute(InputInterface $input, OutputInterface $output) |
|
| 49 | 49 | { |
| 50 | - $ctx = $this->getContainer()->get( 'aimeos_context' )->get( false, 'command' ); |
|
| 51 | - $ctx->setEditor( 'aimeos:setup' ); |
|
| 50 | + $ctx = $this->getContainer()->get('aimeos_context')->get(false, 'command'); |
|
| 51 | + $ctx->setEditor('aimeos:setup'); |
|
| 52 | 52 | |
| 53 | 53 | $config = $ctx->getConfig(); |
| 54 | - $site = $input->getArgument( 'site' ); |
|
| 55 | - $tplsite = $input->getArgument( 'tplsite' ); |
|
| 54 | + $site = $input->getArgument('site'); |
|
| 55 | + $tplsite = $input->getArgument('tplsite'); |
|
| 56 | 56 | |
| 57 | - $config->set( 'setup/site', $site ); |
|
| 58 | - $dbconfig = $this->getDbConfig( $config ); |
|
| 59 | - $this->setOptions( $config, $input ); |
|
| 57 | + $config->set('setup/site', $site); |
|
| 58 | + $dbconfig = $this->getDbConfig($config); |
|
| 59 | + $this->setOptions($config, $input); |
|
| 60 | 60 | |
| 61 | - $taskPaths = $this->getContainer()->get( 'aimeos' )->get()->getSetupPaths( $tplsite ); |
|
| 62 | - $manager = new \Aimeos\MW\Setup\Manager\Multiple( $ctx->getDatabaseManager(), $dbconfig, $taskPaths, $ctx ); |
|
| 61 | + $taskPaths = $this->getContainer()->get('aimeos')->get()->getSetupPaths($tplsite); |
|
| 62 | + $manager = new \Aimeos\MW\Setup\Manager\Multiple($ctx->getDatabaseManager(), $dbconfig, $taskPaths, $ctx); |
|
| 63 | 63 | |
| 64 | - $output->writeln( sprintf( 'Initializing or updating the Aimeos database tables for site <info>%1$s</info>', $site ) ); |
|
| 64 | + $output->writeln(sprintf('Initializing or updating the Aimeos database tables for site <info>%1$s</info>', $site)); |
|
| 65 | 65 | |
| 66 | - if( ( $task = $input->getOption( 'task' ) ) && is_array( $task ) ) { |
|
| 67 | - $task = reset( $task ); |
|
| 66 | + if (($task = $input->getOption('task')) && is_array($task)) { |
|
| 67 | + $task = reset($task); |
|
| 68 | 68 | } |
| 69 | 69 | |
| 70 | - switch( $input->getOption( 'action' ) ) |
|
| 70 | + switch ($input->getOption('action')) |
|
| 71 | 71 | { |
| 72 | 72 | case 'migrate': |
| 73 | - $manager->migrate( $task ); |
|
| 73 | + $manager->migrate($task); |
|
| 74 | 74 | break; |
| 75 | 75 | case 'rollback': |
| 76 | - $manager->rollback( $task ); |
|
| 76 | + $manager->rollback($task); |
|
| 77 | 77 | break; |
| 78 | 78 | case 'clean': |
| 79 | - $manager->clean( $task ); |
|
| 79 | + $manager->clean($task); |
|
| 80 | 80 | break; |
| 81 | 81 | default: |
| 82 | - throw new \Exception( sprintf( 'Invalid setup action "%1$s"', $input->getOption( 'action' ) ) ); |
|
| 82 | + throw new \Exception(sprintf('Invalid setup action "%1$s"', $input->getOption('action'))); |
|
| 83 | 83 | } |
| 84 | 84 | } |
| 85 | 85 | |
@@ -90,14 +90,14 @@ discard block |
||
| 90 | 90 | * @param \Aimeos\MW\Config\Iface $conf Config object |
| 91 | 91 | * @return array Multi-dimensional associative list of database configuration parameters |
| 92 | 92 | */ |
| 93 | - protected function getDbConfig( \Aimeos\MW\Config\Iface $conf ) |
|
| 93 | + protected function getDbConfig(\Aimeos\MW\Config\Iface $conf) |
|
| 94 | 94 | { |
| 95 | - $dbconfig = $conf->get( 'resource', array() ); |
|
| 95 | + $dbconfig = $conf->get('resource', array()); |
|
| 96 | 96 | |
| 97 | - foreach( $dbconfig as $rname => $dbconf ) |
|
| 97 | + foreach ($dbconfig as $rname => $dbconf) |
|
| 98 | 98 | { |
| 99 | - if( strncmp( $rname, 'db', 2 ) !== 0 ) { |
|
| 100 | - unset( $dbconfig[$rname] ); |
|
| 99 | + if (strncmp($rname, 'db', 2) !== 0) { |
|
| 100 | + unset($dbconfig[$rname]); |
|
| 101 | 101 | } |
| 102 | 102 | } |
| 103 | 103 | |
@@ -113,12 +113,12 @@ discard block |
||
| 113 | 113 | * @param array Associative list of database configurations |
| 114 | 114 | * @throws \RuntimeException If the format of the options is invalid |
| 115 | 115 | */ |
| 116 | - protected function setOptions( \Aimeos\MW\Config\Iface $conf, InputInterface $input ) |
|
| 116 | + protected function setOptions(\Aimeos\MW\Config\Iface $conf, InputInterface $input) |
|
| 117 | 117 | { |
| 118 | - foreach( (array) $input->getOption( 'option' ) as $option ) |
|
| 118 | + foreach ((array) $input->getOption('option') as $option) |
|
| 119 | 119 | { |
| 120 | - list( $name, $value ) = explode( ':', $option ); |
|
| 121 | - $conf->set( str_replace( '\\', '/', $name ), $value ); |
|
| 120 | + list($name, $value) = explode(':', $option); |
|
| 121 | + $conf->set(str_replace('\\', '/', $name), $value); |
|
| 122 | 122 | } |
| 123 | 123 | } |
| 124 | 124 | } |
@@ -12,29 +12,29 @@ discard block |
||
| 12 | 12 | $client = static::createClient(array(), array( |
| 13 | 13 | 'PHP_AUTH_USER' => 'admin', |
| 14 | 14 | 'PHP_AUTH_PW' => 'adminpass', |
| 15 | - ) ); |
|
| 15 | + )); |
|
| 16 | 16 | |
| 17 | 17 | |
| 18 | - $client->request( 'OPTIONS', '/unittest/jsonadm/product' ); |
|
| 18 | + $client->request('OPTIONS', '/unittest/jsonadm/product'); |
|
| 19 | 19 | $response = $client->getResponse(); |
| 20 | 20 | |
| 21 | - $json = json_decode( $response->getContent(), true ); |
|
| 21 | + $json = json_decode($response->getContent(), true); |
|
| 22 | 22 | |
| 23 | - $this->assertNotNull( $json ); |
|
| 24 | - $this->assertEquals( 200, $response->getStatusCode() ); |
|
| 25 | - $this->assertArrayHasKey( 'resources', $json['meta'] ); |
|
| 26 | - $this->assertGreaterThan( 1, count( $json['meta']['resources'] ) ); |
|
| 23 | + $this->assertNotNull($json); |
|
| 24 | + $this->assertEquals(200, $response->getStatusCode()); |
|
| 25 | + $this->assertArrayHasKey('resources', $json['meta']); |
|
| 26 | + $this->assertGreaterThan(1, count($json['meta']['resources'])); |
|
| 27 | 27 | |
| 28 | 28 | |
| 29 | - $client->request( 'OPTIONS', '/unittest/jsonadm' ); |
|
| 29 | + $client->request('OPTIONS', '/unittest/jsonadm'); |
|
| 30 | 30 | $response = $client->getResponse(); |
| 31 | 31 | |
| 32 | - $json = json_decode( $response->getContent(), true ); |
|
| 32 | + $json = json_decode($response->getContent(), true); |
|
| 33 | 33 | |
| 34 | - $this->assertNotNull( $json ); |
|
| 35 | - $this->assertEquals( 200, $response->getStatusCode() ); |
|
| 36 | - $this->assertArrayHasKey( 'resources', $json['meta'] ); |
|
| 37 | - $this->assertGreaterThan( 1, count( $json['meta']['resources'] ) ); |
|
| 34 | + $this->assertNotNull($json); |
|
| 35 | + $this->assertEquals(200, $response->getStatusCode()); |
|
| 36 | + $this->assertArrayHasKey('resources', $json['meta']); |
|
| 37 | + $this->assertGreaterThan(1, count($json['meta']['resources'])); |
|
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | |
@@ -43,62 +43,62 @@ discard block |
||
| 43 | 43 | $client = static::createClient(array(), array( |
| 44 | 44 | 'PHP_AUTH_USER' => 'admin', |
| 45 | 45 | 'PHP_AUTH_PW' => 'adminpass', |
| 46 | - ) ); |
|
| 46 | + )); |
|
| 47 | 47 | |
| 48 | 48 | |
| 49 | 49 | $content = '{"data":{"type":"stock/type","attributes":{"stock.type.code":"symfony","stock.type.label":"symfony"}}}'; |
| 50 | - $client->request( 'POST', '/unittest/jsonadm/stock/type', array(), array(), array(), $content ); |
|
| 50 | + $client->request('POST', '/unittest/jsonadm/stock/type', array(), array(), array(), $content); |
|
| 51 | 51 | $response = $client->getResponse(); |
| 52 | 52 | |
| 53 | - $json = json_decode( $response->getContent(), true ); |
|
| 53 | + $json = json_decode($response->getContent(), true); |
|
| 54 | 54 | |
| 55 | - $this->assertNotNull( $json ); |
|
| 56 | - $this->assertEquals( 201, $response->getStatusCode() ); |
|
| 57 | - $this->assertArrayHasKey( 'stock.type.id', $json['data']['attributes'] ); |
|
| 58 | - $this->assertEquals( 'symfony', $json['data']['attributes']['stock.type.code'] ); |
|
| 59 | - $this->assertEquals( 'symfony', $json['data']['attributes']['stock.type.label'] ); |
|
| 60 | - $this->assertEquals( 1, $json['meta']['total'] ); |
|
| 55 | + $this->assertNotNull($json); |
|
| 56 | + $this->assertEquals(201, $response->getStatusCode()); |
|
| 57 | + $this->assertArrayHasKey('stock.type.id', $json['data']['attributes']); |
|
| 58 | + $this->assertEquals('symfony', $json['data']['attributes']['stock.type.code']); |
|
| 59 | + $this->assertEquals('symfony', $json['data']['attributes']['stock.type.label']); |
|
| 60 | + $this->assertEquals(1, $json['meta']['total']); |
|
| 61 | 61 | |
| 62 | 62 | $id = $json['data']['attributes']['stock.type.id']; |
| 63 | 63 | |
| 64 | 64 | |
| 65 | 65 | $content = '{"data":{"type":"stock/type","attributes":{"stock.type.code":"symfony2","stock.type.label":"symfony2"}}}'; |
| 66 | - $client->request( 'PATCH', '/unittest/jsonadm/stock/type/' . $id, array(), array(), array(), $content ); |
|
| 66 | + $client->request('PATCH', '/unittest/jsonadm/stock/type/'.$id, array(), array(), array(), $content); |
|
| 67 | 67 | $response = $client->getResponse(); |
| 68 | 68 | |
| 69 | - $json = json_decode( $response->getContent(), true ); |
|
| 69 | + $json = json_decode($response->getContent(), true); |
|
| 70 | 70 | |
| 71 | - $this->assertNotNull( $json ); |
|
| 72 | - $this->assertEquals( 200, $response->getStatusCode() ); |
|
| 73 | - $this->assertArrayHasKey( 'stock.type.id', $json['data']['attributes'] ); |
|
| 74 | - $this->assertEquals( 'symfony2', $json['data']['attributes']['stock.type.code'] ); |
|
| 75 | - $this->assertEquals( 'symfony2', $json['data']['attributes']['stock.type.label'] ); |
|
| 76 | - $this->assertEquals( $id, $json['data']['attributes']['stock.type.id'] ); |
|
| 77 | - $this->assertEquals( 1, $json['meta']['total'] ); |
|
| 71 | + $this->assertNotNull($json); |
|
| 72 | + $this->assertEquals(200, $response->getStatusCode()); |
|
| 73 | + $this->assertArrayHasKey('stock.type.id', $json['data']['attributes']); |
|
| 74 | + $this->assertEquals('symfony2', $json['data']['attributes']['stock.type.code']); |
|
| 75 | + $this->assertEquals('symfony2', $json['data']['attributes']['stock.type.label']); |
|
| 76 | + $this->assertEquals($id, $json['data']['attributes']['stock.type.id']); |
|
| 77 | + $this->assertEquals(1, $json['meta']['total']); |
|
| 78 | 78 | |
| 79 | 79 | |
| 80 | - $client->request( 'GET', '/unittest/jsonadm/stock/type/' . $id ); |
|
| 80 | + $client->request('GET', '/unittest/jsonadm/stock/type/'.$id); |
|
| 81 | 81 | $response = $client->getResponse(); |
| 82 | 82 | |
| 83 | - $json = json_decode( $response->getContent(), true ); |
|
| 83 | + $json = json_decode($response->getContent(), true); |
|
| 84 | 84 | |
| 85 | - $this->assertNotNull( $json ); |
|
| 86 | - $this->assertEquals( 200, $response->getStatusCode() ); |
|
| 87 | - $this->assertArrayHasKey( 'stock.type.id', $json['data']['attributes'] ); |
|
| 88 | - $this->assertEquals( 'symfony2', $json['data']['attributes']['stock.type.code'] ); |
|
| 89 | - $this->assertEquals( 'symfony2', $json['data']['attributes']['stock.type.label'] ); |
|
| 90 | - $this->assertEquals( $id, $json['data']['attributes']['stock.type.id'] ); |
|
| 91 | - $this->assertEquals( 1, $json['meta']['total'] ); |
|
| 85 | + $this->assertNotNull($json); |
|
| 86 | + $this->assertEquals(200, $response->getStatusCode()); |
|
| 87 | + $this->assertArrayHasKey('stock.type.id', $json['data']['attributes']); |
|
| 88 | + $this->assertEquals('symfony2', $json['data']['attributes']['stock.type.code']); |
|
| 89 | + $this->assertEquals('symfony2', $json['data']['attributes']['stock.type.label']); |
|
| 90 | + $this->assertEquals($id, $json['data']['attributes']['stock.type.id']); |
|
| 91 | + $this->assertEquals(1, $json['meta']['total']); |
|
| 92 | 92 | |
| 93 | 93 | |
| 94 | - $client->request( 'DELETE', '/unittest/jsonadm/stock/type/' . $id ); |
|
| 94 | + $client->request('DELETE', '/unittest/jsonadm/stock/type/'.$id); |
|
| 95 | 95 | $response = $client->getResponse(); |
| 96 | 96 | |
| 97 | - $json = json_decode( $response->getContent(), true ); |
|
| 97 | + $json = json_decode($response->getContent(), true); |
|
| 98 | 98 | |
| 99 | - $this->assertNotNull( $json ); |
|
| 100 | - $this->assertEquals( 200, $response->getStatusCode() ); |
|
| 101 | - $this->assertEquals( 1, $json['meta']['total'] ); |
|
| 99 | + $this->assertNotNull($json); |
|
| 100 | + $this->assertEquals(200, $response->getStatusCode()); |
|
| 101 | + $this->assertEquals(1, $json['meta']['total']); |
|
| 102 | 102 | } |
| 103 | 103 | |
| 104 | 104 | |
@@ -107,85 +107,85 @@ discard block |
||
| 107 | 107 | $client = static::createClient(array(), array( |
| 108 | 108 | 'PHP_AUTH_USER' => 'admin', |
| 109 | 109 | 'PHP_AUTH_PW' => 'adminpass', |
| 110 | - ) ); |
|
| 110 | + )); |
|
| 111 | 111 | |
| 112 | 112 | |
| 113 | 113 | $content = '{"data":[ |
| 114 | 114 | {"type":"stock/type","attributes":{"stock.type.code":"symfony","stock.type.label":"symfony"}}, |
| 115 | 115 | {"type":"stock/type","attributes":{"stock.type.code":"symfony2","stock.type.label":"symfony"}} |
| 116 | 116 | ]}'; |
| 117 | - $client->request( 'POST', '/unittest/jsonadm/stock/type', array(), array(), array(), $content ); |
|
| 117 | + $client->request('POST', '/unittest/jsonadm/stock/type', array(), array(), array(), $content); |
|
| 118 | 118 | $response = $client->getResponse(); |
| 119 | 119 | |
| 120 | - $json = json_decode( $response->getContent(), true ); |
|
| 120 | + $json = json_decode($response->getContent(), true); |
|
| 121 | 121 | |
| 122 | - $this->assertNotNull( $json ); |
|
| 123 | - $this->assertEquals( 201, $response->getStatusCode() ); |
|
| 124 | - $this->assertEquals( 2, count( $json['data'] ) ); |
|
| 125 | - $this->assertArrayHasKey( 'stock.type.id', $json['data'][0]['attributes'] ); |
|
| 126 | - $this->assertArrayHasKey( 'stock.type.id', $json['data'][1]['attributes'] ); |
|
| 127 | - $this->assertEquals( 'symfony', $json['data'][0]['attributes']['stock.type.label'] ); |
|
| 128 | - $this->assertEquals( 'symfony', $json['data'][1]['attributes']['stock.type.label'] ); |
|
| 129 | - $this->assertEquals( 2, $json['meta']['total'] ); |
|
| 122 | + $this->assertNotNull($json); |
|
| 123 | + $this->assertEquals(201, $response->getStatusCode()); |
|
| 124 | + $this->assertEquals(2, count($json['data'])); |
|
| 125 | + $this->assertArrayHasKey('stock.type.id', $json['data'][0]['attributes']); |
|
| 126 | + $this->assertArrayHasKey('stock.type.id', $json['data'][1]['attributes']); |
|
| 127 | + $this->assertEquals('symfony', $json['data'][0]['attributes']['stock.type.label']); |
|
| 128 | + $this->assertEquals('symfony', $json['data'][1]['attributes']['stock.type.label']); |
|
| 129 | + $this->assertEquals(2, $json['meta']['total']); |
|
| 130 | 130 | |
| 131 | - $ids = array( $json['data'][0]['attributes']['stock.type.id'], $json['data'][1]['attributes']['stock.type.id'] ); |
|
| 131 | + $ids = array($json['data'][0]['attributes']['stock.type.id'], $json['data'][1]['attributes']['stock.type.id']); |
|
| 132 | 132 | |
| 133 | 133 | |
| 134 | 134 | $content = '{"data":[ |
| 135 | - {"type":"stock/type","id":' . $ids[0] . ',"attributes":{"stock.type.label":"symfony2"}}, |
|
| 136 | - {"type":"stock/type","id":' . $ids[1] . ',"attributes":{"stock.type.label":"symfony2"}} |
|
| 135 | + {"type":"stock/type","id":' . $ids[0].',"attributes":{"stock.type.label":"symfony2"}}, |
|
| 136 | + {"type":"stock/type","id":' . $ids[1].',"attributes":{"stock.type.label":"symfony2"}} |
|
| 137 | 137 | ]}'; |
| 138 | - $client->request( 'PATCH', '/unittest/jsonadm/stock/type', array(), array(), array(), $content ); |
|
| 138 | + $client->request('PATCH', '/unittest/jsonadm/stock/type', array(), array(), array(), $content); |
|
| 139 | 139 | $response = $client->getResponse(); |
| 140 | 140 | |
| 141 | - $json = json_decode( $response->getContent(), true ); |
|
| 142 | - |
|
| 143 | - $this->assertNotNull( $json ); |
|
| 144 | - $this->assertEquals( 200, $response->getStatusCode() ); |
|
| 145 | - $this->assertEquals( 2, count( $json['data'] ) ); |
|
| 146 | - $this->assertArrayHasKey( 'stock.type.id', $json['data'][0]['attributes'] ); |
|
| 147 | - $this->assertArrayHasKey( 'stock.type.id', $json['data'][1]['attributes'] ); |
|
| 148 | - $this->assertEquals( 'symfony2', $json['data'][0]['attributes']['stock.type.label'] ); |
|
| 149 | - $this->assertEquals( 'symfony2', $json['data'][1]['attributes']['stock.type.label'] ); |
|
| 150 | - $this->assertTrue( in_array( $json['data'][0]['attributes']['stock.type.id'], $ids ) ); |
|
| 151 | - $this->assertTrue( in_array( $json['data'][1]['attributes']['stock.type.id'], $ids ) ); |
|
| 152 | - $this->assertEquals( 2, $json['meta']['total'] ); |
|
| 153 | - |
|
| 154 | - |
|
| 155 | - $getParams = array( 'filter' => array( '&&' => array( |
|
| 156 | - array( '=~' => array( 'stock.type.code' => 'symfony' ) ), |
|
| 157 | - array( '==' => array( 'stock.type.label' => 'symfony2' ) ) |
|
| 158 | - ) ), |
|
| 159 | - 'sort' => 'stock.type.code', 'page' => array( 'offset' => 0, 'limit' => 3 ) |
|
| 141 | + $json = json_decode($response->getContent(), true); |
|
| 142 | + |
|
| 143 | + $this->assertNotNull($json); |
|
| 144 | + $this->assertEquals(200, $response->getStatusCode()); |
|
| 145 | + $this->assertEquals(2, count($json['data'])); |
|
| 146 | + $this->assertArrayHasKey('stock.type.id', $json['data'][0]['attributes']); |
|
| 147 | + $this->assertArrayHasKey('stock.type.id', $json['data'][1]['attributes']); |
|
| 148 | + $this->assertEquals('symfony2', $json['data'][0]['attributes']['stock.type.label']); |
|
| 149 | + $this->assertEquals('symfony2', $json['data'][1]['attributes']['stock.type.label']); |
|
| 150 | + $this->assertTrue(in_array($json['data'][0]['attributes']['stock.type.id'], $ids)); |
|
| 151 | + $this->assertTrue(in_array($json['data'][1]['attributes']['stock.type.id'], $ids)); |
|
| 152 | + $this->assertEquals(2, $json['meta']['total']); |
|
| 153 | + |
|
| 154 | + |
|
| 155 | + $getParams = array('filter' => array('&&' => array( |
|
| 156 | + array('=~' => array('stock.type.code' => 'symfony')), |
|
| 157 | + array('==' => array('stock.type.label' => 'symfony2')) |
|
| 158 | + )), |
|
| 159 | + 'sort' => 'stock.type.code', 'page' => array('offset' => 0, 'limit' => 3) |
|
| 160 | 160 | ); |
| 161 | - $client->request( 'GET', '/unittest/jsonadm/stock/type', $getParams ); |
|
| 161 | + $client->request('GET', '/unittest/jsonadm/stock/type', $getParams); |
|
| 162 | 162 | $response = $client->getResponse(); |
| 163 | 163 | |
| 164 | - $json = json_decode( $response->getContent(), true ); |
|
| 164 | + $json = json_decode($response->getContent(), true); |
|
| 165 | 165 | |
| 166 | - $this->assertNotNull( $json ); |
|
| 167 | - $this->assertEquals( 200, $response->getStatusCode() ); |
|
| 168 | - $this->assertEquals( 2, count( $json['data'] ) ); |
|
| 169 | - $this->assertEquals( 'symfony', $json['data'][0]['attributes']['stock.type.code'] ); |
|
| 170 | - $this->assertEquals( 'symfony2', $json['data'][1]['attributes']['stock.type.code'] ); |
|
| 171 | - $this->assertEquals( 'symfony2', $json['data'][0]['attributes']['stock.type.label'] ); |
|
| 172 | - $this->assertEquals( 'symfony2', $json['data'][1]['attributes']['stock.type.label'] ); |
|
| 173 | - $this->assertTrue( in_array( $json['data'][0]['attributes']['stock.type.id'], $ids ) ); |
|
| 174 | - $this->assertTrue( in_array( $json['data'][1]['attributes']['stock.type.id'], $ids ) ); |
|
| 175 | - $this->assertEquals( 2, $json['meta']['total'] ); |
|
| 166 | + $this->assertNotNull($json); |
|
| 167 | + $this->assertEquals(200, $response->getStatusCode()); |
|
| 168 | + $this->assertEquals(2, count($json['data'])); |
|
| 169 | + $this->assertEquals('symfony', $json['data'][0]['attributes']['stock.type.code']); |
|
| 170 | + $this->assertEquals('symfony2', $json['data'][1]['attributes']['stock.type.code']); |
|
| 171 | + $this->assertEquals('symfony2', $json['data'][0]['attributes']['stock.type.label']); |
|
| 172 | + $this->assertEquals('symfony2', $json['data'][1]['attributes']['stock.type.label']); |
|
| 173 | + $this->assertTrue(in_array($json['data'][0]['attributes']['stock.type.id'], $ids)); |
|
| 174 | + $this->assertTrue(in_array($json['data'][1]['attributes']['stock.type.id'], $ids)); |
|
| 175 | + $this->assertEquals(2, $json['meta']['total']); |
|
| 176 | 176 | |
| 177 | 177 | |
| 178 | 178 | $content = '{"data":[ |
| 179 | - {"type":"stock/type","id":' . $ids[0] . '}, |
|
| 180 | - {"type":"stock/type","id":' . $ids[1] . '} |
|
| 179 | + {"type":"stock/type","id":' . $ids[0].'}, |
|
| 180 | + {"type":"stock/type","id":' . $ids[1].'} |
|
| 181 | 181 | ]}'; |
| 182 | - $client->request( 'DELETE', '/unittest/jsonadm/stock/type', array(), array(), array(), $content ); |
|
| 182 | + $client->request('DELETE', '/unittest/jsonadm/stock/type', array(), array(), array(), $content); |
|
| 183 | 183 | $response = $client->getResponse(); |
| 184 | 184 | |
| 185 | - $json = json_decode( $response->getContent(), true ); |
|
| 185 | + $json = json_decode($response->getContent(), true); |
|
| 186 | 186 | |
| 187 | - $this->assertNotNull( $json ); |
|
| 188 | - $this->assertEquals( 200, $response->getStatusCode() ); |
|
| 189 | - $this->assertEquals( 2, $json['meta']['total'] ); |
|
| 187 | + $this->assertNotNull($json); |
|
| 188 | + $this->assertEquals(200, $response->getStatusCode()); |
|
| 189 | + $this->assertEquals(2, $json['meta']['total']); |
|
| 190 | 190 | } |
| 191 | 191 | } |
@@ -28,9 +28,9 @@ discard block |
||
| 28 | 28 | */ |
| 29 | 29 | protected function configure() |
| 30 | 30 | { |
| 31 | - $this->setName( 'aimeos:cache' ); |
|
| 32 | - $this->setDescription( 'Clears the content cache' ); |
|
| 33 | - $this->addArgument( 'site', InputArgument::OPTIONAL, 'Site codes to clear the cache like "default unittest" (none for all)' ); |
|
| 31 | + $this->setName('aimeos:cache'); |
|
| 32 | + $this->setDescription('Clears the content cache'); |
|
| 33 | + $this->addArgument('site', InputArgument::OPTIONAL, 'Site codes to clear the cache like "default unittest" (none for all)'); |
|
| 34 | 34 | } |
| 35 | 35 | |
| 36 | 36 | |
@@ -40,26 +40,26 @@ discard block |
||
| 40 | 40 | * @param InputInterface $input Input object |
| 41 | 41 | * @param OutputInterface $output Output object |
| 42 | 42 | */ |
| 43 | - protected function execute( InputInterface $input, OutputInterface $output ) |
|
| 43 | + protected function execute(InputInterface $input, OutputInterface $output) |
|
| 44 | 44 | { |
| 45 | - $context = $this->getContainer()->get( 'aimeos_context' )->get( false, 'command' ); |
|
| 46 | - $context->setEditor( 'aimeos:cache' ); |
|
| 45 | + $context = $this->getContainer()->get('aimeos_context')->get(false, 'command'); |
|
| 46 | + $context->setEditor('aimeos:cache'); |
|
| 47 | 47 | |
| 48 | - $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context ); |
|
| 48 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context); |
|
| 49 | 49 | |
| 50 | - foreach( $this->getSiteItems( $context, $input ) as $siteItem ) |
|
| 50 | + foreach ($this->getSiteItems($context, $input) as $siteItem) |
|
| 51 | 51 | { |
| 52 | - $localeItem = $localeManager->bootstrap( $siteItem->getCode(), '', '', false ); |
|
| 52 | + $localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false); |
|
| 53 | 53 | |
| 54 | 54 | $lcontext = clone $context; |
| 55 | - $lcontext->setLocale( $localeItem ); |
|
| 55 | + $lcontext->setLocale($localeItem); |
|
| 56 | 56 | |
| 57 | - $cache = new \Aimeos\MAdmin\Cache\Proxy\Standard( $lcontext ); |
|
| 58 | - $lcontext->setCache( $cache ); |
|
| 57 | + $cache = new \Aimeos\MAdmin\Cache\Proxy\Standard($lcontext); |
|
| 58 | + $lcontext->setCache($cache); |
|
| 59 | 59 | |
| 60 | - $output->writeln( sprintf( 'Clearing the Aimeos cache for site <info>%1$s</info>', $siteItem->getCode() ) ); |
|
| 60 | + $output->writeln(sprintf('Clearing the Aimeos cache for site <info>%1$s</info>', $siteItem->getCode())); |
|
| 61 | 61 | |
| 62 | - \Aimeos\MAdmin\Cache\Manager\Factory::createManager( $lcontext )->getCache()->clear(); |
|
| 62 | + \Aimeos\MAdmin\Cache\Manager\Factory::createManager($lcontext)->getCache()->clear(); |
|
| 63 | 63 | } |
| 64 | 64 | } |
| 65 | 65 | } |
@@ -31,21 +31,21 @@ discard block |
||
| 31 | 31 | /** |
| 32 | 32 | * {@inheritDoc} |
| 33 | 33 | */ |
| 34 | - public function load( array $configs, ContainerBuilder $container ) |
|
| 34 | + public function load(array $configs, ContainerBuilder $container) |
|
| 35 | 35 | { |
| 36 | 36 | $configuration = new Configuration(); |
| 37 | - $config = $this->processConfiguration( $configuration, $configs ); |
|
| 37 | + $config = $this->processConfiguration($configuration, $configs); |
|
| 38 | 38 | |
| 39 | - foreach( $configs as $list ) { |
|
| 40 | - $config = array_replace_recursive( $config, $list ); |
|
| 39 | + foreach ($configs as $list) { |
|
| 40 | + $config = array_replace_recursive($config, $list); |
|
| 41 | 41 | } |
| 42 | 42 | |
| 43 | - foreach( $config as $key => $value ) { |
|
| 44 | - $container->setParameter( 'aimeos_shop.' . $key, $value ); |
|
| 43 | + foreach ($config as $key => $value) { |
|
| 44 | + $container->setParameter('aimeos_shop.'.$key, $value); |
|
| 45 | 45 | } |
| 46 | 46 | |
| 47 | - $loader = new Loader\YamlFileLoader( $container, new FileLocator( dirname( __DIR__ ) . '/Resources/config' ) ); |
|
| 48 | - $loader->load( 'services.yml' ); |
|
| 47 | + $loader = new Loader\YamlFileLoader($container, new FileLocator(dirname(__DIR__).'/Resources/config')); |
|
| 48 | + $loader->load('services.yml'); |
|
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | |
@@ -54,12 +54,12 @@ discard block |
||
| 54 | 54 | * |
| 55 | 55 | * @param ContainerBuilder $container ContainerBuilder object |
| 56 | 56 | */ |
| 57 | - public function prepend( ContainerBuilder $container ) |
|
| 57 | + public function prepend(ContainerBuilder $container) |
|
| 58 | 58 | { |
| 59 | - $configFile = dirname( __DIR__ ) . '/Resources/config/aimeos_shop.yml'; |
|
| 60 | - $config = Yaml::parse( file_get_contents( $configFile ) ); |
|
| 59 | + $configFile = dirname(__DIR__).'/Resources/config/aimeos_shop.yml'; |
|
| 60 | + $config = Yaml::parse(file_get_contents($configFile)); |
|
| 61 | 61 | |
| 62 | - $container->prependExtensionConfig( 'aimeos_shop', $config ); |
|
| 63 | - $container->addResource( new FileResource( $configFile ) ); |
|
| 62 | + $container->prependExtensionConfig('aimeos_shop', $config); |
|
| 63 | + $container->addResource(new FileResource($configFile)); |
|
| 64 | 64 | } |
| 65 | 65 | } |
@@ -3,24 +3,24 @@ discard block |
||
| 3 | 3 | use Doctrine\Common\Annotations\AnnotationRegistry; |
| 4 | 4 | |
| 5 | 5 | |
| 6 | -setlocale( LC_ALL, 'en_US.UTF-8' ); |
|
| 6 | +setlocale(LC_ALL, 'en_US.UTF-8'); |
|
| 7 | 7 | |
| 8 | 8 | // if the bundle is within a symfony project, try to reuse the project's autoload |
| 9 | 9 | $files = array( |
| 10 | - __DIR__ . '/../vendor/autoload.php', |
|
| 11 | - __DIR__ . '/../../vendor/autoload.php', |
|
| 10 | + __DIR__.'/../vendor/autoload.php', |
|
| 11 | + __DIR__.'/../../vendor/autoload.php', |
|
| 12 | 12 | ); |
| 13 | 13 | |
| 14 | 14 | $autoload = false; |
| 15 | -foreach( $files as $file ) |
|
| 15 | +foreach ($files as $file) |
|
| 16 | 16 | { |
| 17 | - if( is_file( $file ) ) { |
|
| 17 | + if (is_file($file)) { |
|
| 18 | 18 | $autoload = require $file; |
| 19 | 19 | break; |
| 20 | 20 | } |
| 21 | 21 | } |
| 22 | 22 | |
| 23 | -if( !$autoload ) |
|
| 23 | +if (!$autoload) |
|
| 24 | 24 | { |
| 25 | 25 | exit( |
| 26 | 26 | "Unable to find autoload.php file, please use composer to load dependencies: |
@@ -30,4 +30,4 @@ discard block |
||
| 30 | 30 | ); |
| 31 | 31 | } |
| 32 | 32 | |
| 33 | -AnnotationRegistry::registerLoader( array( $autoload, 'loadClass' ) ); |
|
| 33 | +AnnotationRegistry::registerLoader(array($autoload, 'loadClass')); |
|
@@ -28,9 +28,9 @@ discard block |
||
| 28 | 28 | /** |
| 29 | 29 | * {@inheritdoc} |
| 30 | 30 | */ |
| 31 | - public function registerContainerConfiguration( LoaderInterface $loader ) |
|
| 31 | + public function registerContainerConfiguration(LoaderInterface $loader) |
|
| 32 | 32 | { |
| 33 | - $loader->load( __DIR__ . '/config/config.yml' ); |
|
| 33 | + $loader->load(__DIR__.'/config/config.yml'); |
|
| 34 | 34 | } |
| 35 | 35 | |
| 36 | 36 | |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | */ |
| 40 | 40 | public function getCacheDir() |
| 41 | 41 | { |
| 42 | - return sys_get_temp_dir() . '/aimeos-symfony/cache'; |
|
| 42 | + return sys_get_temp_dir().'/aimeos-symfony/cache'; |
|
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | |
@@ -48,6 +48,6 @@ discard block |
||
| 48 | 48 | */ |
| 49 | 49 | public function getLogDir() |
| 50 | 50 | { |
| 51 | - return sys_get_temp_dir() . '/aimeos-symfony/logs'; |
|
| 51 | + return sys_get_temp_dir().'/aimeos-symfony/logs'; |
|
| 52 | 52 | } |
| 53 | 53 | } |