@@ -31,7 +31,6 @@ |
||
31 | 31 | * Initializes the URL view helper. |
32 | 32 | * |
33 | 33 | * @param \Aimeos\MW\View\Iface $view View instance with registered view helpers |
34 | - * @param \Symfony\Component\HttpFoundation\Request $request Symfony2 request object |
|
35 | 34 | */ |
36 | 35 | public function __construct( $view, \Symfony\Component\HttpFoundation\Request $req ) |
37 | 36 | { |
@@ -33,9 +33,9 @@ discard block |
||
33 | 33 | * @param \Aimeos\MW\View\Iface $view View instance with registered view helpers |
34 | 34 | * @param \Symfony\Component\HttpFoundation\Request $request Symfony2 request object |
35 | 35 | */ |
36 | - public function __construct( $view, \Symfony\Component\HttpFoundation\Request $req ) |
|
36 | + public function __construct($view, \Symfony\Component\HttpFoundation\Request $req) |
|
37 | 37 | { |
38 | - parent::__construct( $view, $req->getContent(), $req->getClientIp(), $req->get( '_route' ), $req->files ); |
|
38 | + parent::__construct($view, $req->getContent(), $req->getClientIp(), $req->get('_route'), $req->files); |
|
39 | 39 | } |
40 | 40 | |
41 | 41 | |
@@ -45,13 +45,13 @@ discard block |
||
45 | 45 | * @param \Traversable|array $files File upload data |
46 | 46 | * @return array Multi-dimensional list of file objects |
47 | 47 | */ |
48 | - protected function createUploadedFiles( $files ) |
|
48 | + protected function createUploadedFiles($files) |
|
49 | 49 | { |
50 | 50 | $files = array(); |
51 | 51 | |
52 | - foreach( $files as $key => $value ) |
|
52 | + foreach ($files as $key => $value) |
|
53 | 53 | { |
54 | - if( $value instanceof UploadedFile ) |
|
54 | + if ($value instanceof UploadedFile) |
|
55 | 55 | { |
56 | 56 | $files[$key] = new \Aimeos\MW\View\Helper\Request\File\Standard( |
57 | 57 | $value->getRealPath(), |
@@ -60,8 +60,7 @@ |
||
60 | 60 | $value->getClientMimeType(), |
61 | 61 | $value->getError() |
62 | 62 | ); |
63 | - } |
|
64 | - else |
|
63 | + } else |
|
65 | 64 | { |
66 | 65 | $files[$key] = $this->createUploadedFiles($value); |
67 | 66 | } |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | */ |
41 | 41 | public function getPostDependencies() |
42 | 42 | { |
43 | - return array( 'TablesCreateFosUser' ); |
|
43 | + return array('TablesCreateFosUser'); |
|
44 | 44 | } |
45 | 45 | |
46 | 46 | |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | */ |
50 | 50 | protected function mysql() |
51 | 51 | { |
52 | - $this->process( $this->mysql ); |
|
52 | + $this->process($this->mysql); |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | |
@@ -58,22 +58,22 @@ discard block |
||
58 | 58 | * |
59 | 59 | * array string $stmts List of SQL statements for changing the columns |
60 | 60 | */ |
61 | - protected function process( array $stmts ) |
|
61 | + protected function process(array $stmts) |
|
62 | 62 | { |
63 | 63 | $table = 'fos_user_address'; |
64 | - $this->msg( sprintf( 'Rename "refid" to "parentid" in table "%1$s"', $table ), 0 ); $this->status( '' ); |
|
64 | + $this->msg(sprintf('Rename "refid" to "parentid" in table "%1$s"', $table), 0); $this->status(''); |
|
65 | 65 | |
66 | - foreach( $stmts as $column => $stmts ) |
|
66 | + foreach ($stmts as $column => $stmts) |
|
67 | 67 | { |
68 | - $this->msg( sprintf( 'Checking column "%1$s"', $column ), 1 ); |
|
68 | + $this->msg(sprintf('Checking column "%1$s"', $column), 1); |
|
69 | 69 | |
70 | - if( $this->schema->tableExists( $table ) |
|
71 | - && $this->schema->columnExists( $table, $column ) === true |
|
70 | + if ($this->schema->tableExists($table) |
|
71 | + && $this->schema->columnExists($table, $column) === true |
|
72 | 72 | ) { |
73 | - $this->executeList( $stmts ); |
|
74 | - $this->status( 'done' ); |
|
73 | + $this->executeList($stmts); |
|
74 | + $this->status('done'); |
|
75 | 75 | } else { |
76 | - $this->status( 'OK' ); |
|
76 | + $this->status('OK'); |
|
77 | 77 | } |
78 | 78 | } |
79 | 79 | } |
@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | */ |
22 | 22 | public function getPostDependencies() |
23 | 23 | { |
24 | - return array( 'MShopAddTypeData' ); |
|
24 | + return array('MShopAddTypeData'); |
|
25 | 25 | } |
26 | 26 | |
27 | 27 | |
@@ -30,8 +30,8 @@ discard block |
||
30 | 30 | */ |
31 | 31 | protected function mysql() |
32 | 32 | { |
33 | - $this->msg( 'Creating Aimeos FOS user bundle tables', 0 ); |
|
34 | - $this->status( '' ); |
|
33 | + $this->msg('Creating Aimeos FOS user bundle tables', 0); |
|
34 | + $this->status(''); |
|
35 | 35 | |
36 | 36 | $ds = DIRECTORY_SEPARATOR; |
37 | 37 | |
@@ -39,6 +39,6 @@ discard block |
||
39 | 39 | 'db-customer' => __DIR__ . $ds . 'default' . $ds . 'schema' . $ds . 'mysql' . $ds . 'customer.sql', |
40 | 40 | ); |
41 | 41 | |
42 | - $this->setup( $files ); |
|
42 | + $this->setup($files); |
|
43 | 43 | } |
44 | 44 | } |
@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | */ |
22 | 22 | public function getPreDependencies() |
23 | 23 | { |
24 | - return array( 'TablesAddFosUserTestData' ); |
|
24 | + return array('TablesAddFosUserTestData'); |
|
25 | 25 | } |
26 | 26 | |
27 | 27 | |
@@ -31,36 +31,36 @@ discard block |
||
31 | 31 | protected function process() |
32 | 32 | { |
33 | 33 | $iface = '\\Aimeos\\MShop\\Context\\Item\\Iface'; |
34 | - if( !( $this->additional instanceof $iface ) ) { |
|
35 | - throw new \Aimeos\MW\Setup\Exception( sprintf( 'Additionally provided object is not of type "%1$s"', $iface ) ); |
|
34 | + if (!($this->additional instanceof $iface)) { |
|
35 | + throw new \Aimeos\MW\Setup\Exception(sprintf('Additionally provided object is not of type "%1$s"', $iface)); |
|
36 | 36 | } |
37 | 37 | |
38 | - $this->msg( 'Adding Fos user bundle customer test data', 0 ); |
|
39 | - $this->additional->setEditor( 'ai-symfony:unittest' ); |
|
38 | + $this->msg('Adding Fos user bundle customer test data', 0); |
|
39 | + $this->additional->setEditor('ai-symfony:unittest'); |
|
40 | 40 | |
41 | 41 | $parentIds = array(); |
42 | 42 | $ds = DIRECTORY_SEPARATOR; |
43 | 43 | $path = __DIR__ . $ds . 'data' . $ds . 'customer.php'; |
44 | 44 | |
45 | - if( ( $testdata = include( $path ) ) === false ){ |
|
46 | - throw new \Aimeos\MShop\Exception( sprintf( 'No file "%1$s" found for customer domain', $path ) ); |
|
45 | + if (($testdata = include($path)) === false) { |
|
46 | + throw new \Aimeos\MShop\Exception(sprintf('No file "%1$s" found for customer domain', $path)); |
|
47 | 47 | } |
48 | 48 | |
49 | 49 | |
50 | - $customerManager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $this->additional, 'FosUser' ); |
|
51 | - $customerAddressManager = $customerManager->getSubManager( 'address', 'FosUser' ); |
|
50 | + $customerManager = \Aimeos\MShop\Customer\Manager\Factory::createManager($this->additional, 'FosUser'); |
|
51 | + $customerAddressManager = $customerManager->getSubManager('address', 'FosUser'); |
|
52 | 52 | |
53 | - foreach( $customerManager->searchItems( $customerManager->createSearch() ) as $id => $item ) { |
|
54 | - $parentIds[ 'customer/' . $item->getCode() ] = $id; |
|
53 | + foreach ($customerManager->searchItems($customerManager->createSearch()) as $id => $item) { |
|
54 | + $parentIds['customer/' . $item->getCode()] = $id; |
|
55 | 55 | } |
56 | 56 | |
57 | 57 | $this->conn->begin(); |
58 | 58 | |
59 | - $this->addCustomerAddressData( $testdata, $customerAddressManager, $parentIds ); |
|
59 | + $this->addCustomerAddressData($testdata, $customerAddressManager, $parentIds); |
|
60 | 60 | |
61 | 61 | $this->conn->commit(); |
62 | 62 | |
63 | 63 | |
64 | - $this->status( 'done' ); |
|
64 | + $this->status('done'); |
|
65 | 65 | } |
66 | 66 | } |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | */ |
23 | 23 | public function getPreDependencies() |
24 | 24 | { |
25 | - return array( 'TablesCreateFosUser', 'CustomerAddFosUserTestData', 'LocaleAddTestData', 'TextAddTestData' ); |
|
25 | + return array('TablesCreateFosUser', 'CustomerAddFosUserTestData', 'LocaleAddTestData', 'TextAddTestData'); |
|
26 | 26 | } |
27 | 27 | |
28 | 28 | |
@@ -32,29 +32,29 @@ discard block |
||
32 | 32 | protected function process() |
33 | 33 | { |
34 | 34 | $iface = '\\Aimeos\\MShop\\Context\\Item\\Iface'; |
35 | - if( !( $this->additional instanceof $iface ) ) { |
|
36 | - throw new \Aimeos\MW\Setup\Exception( sprintf( 'Additionally provided object is not of type "%1$s"', $iface ) ); |
|
35 | + if (!($this->additional instanceof $iface)) { |
|
36 | + throw new \Aimeos\MW\Setup\Exception(sprintf('Additionally provided object is not of type "%1$s"', $iface)); |
|
37 | 37 | } |
38 | 38 | |
39 | - $this->msg( 'Adding customer-list Fos user bundle test data', 0 ); |
|
40 | - $this->additional->setEditor( 'ai-symfony:unittest' ); |
|
39 | + $this->msg('Adding customer-list Fos user bundle test data', 0); |
|
40 | + $this->additional->setEditor('ai-symfony:unittest'); |
|
41 | 41 | |
42 | 42 | $ds = DIRECTORY_SEPARATOR; |
43 | - $path = dirname( __FILE__ ) . $ds . 'data' . $ds . 'customer-list.php'; |
|
43 | + $path = dirname(__FILE__) . $ds . 'data' . $ds . 'customer-list.php'; |
|
44 | 44 | |
45 | - if( ( $testdata = include( $path ) ) === false ){ |
|
46 | - throw new \Aimeos\MShop\Exception( sprintf( 'No file "%1$s" found for customer list domain', $path ) ); |
|
45 | + if (($testdata = include($path)) === false) { |
|
46 | + throw new \Aimeos\MShop\Exception(sprintf('No file "%1$s" found for customer list domain', $path)); |
|
47 | 47 | } |
48 | 48 | |
49 | 49 | $refKeys = array(); |
50 | - foreach( $testdata['customer/lists'] as $dataset ) { |
|
51 | - $refKeys[ $dataset['domain'] ][] = $dataset['refid']; |
|
50 | + foreach ($testdata['customer/lists'] as $dataset) { |
|
51 | + $refKeys[$dataset['domain']][] = $dataset['refid']; |
|
52 | 52 | } |
53 | 53 | |
54 | 54 | $refIds = array(); |
55 | - $refIds['text'] = $this->getTextData( $refKeys['text'] ); |
|
56 | - $this->addCustomerListData( $testdata, $refIds, 'FosUser' ); |
|
55 | + $refIds['text'] = $this->getTextData($refKeys['text']); |
|
56 | + $this->addCustomerListData($testdata, $refIds, 'FosUser'); |
|
57 | 57 | |
58 | - $this->status( 'done' ); |
|
58 | + $this->status('done'); |
|
59 | 59 | } |
60 | 60 | } |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | $this->status(''); |
46 | 46 | |
47 | 47 | $file = __DIR__ . DIRECTORY_SEPARATOR . 'data' . DIRECTORY_SEPARATOR . 'mysql.sql'; |
48 | - $this->process( $file ); |
|
48 | + $this->process($file); |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | |
@@ -54,15 +54,15 @@ discard block |
||
54 | 54 | * |
55 | 55 | * @param string $filename Name of the file |
56 | 56 | */ |
57 | - protected function process( $filename ) |
|
57 | + protected function process($filename) |
|
58 | 58 | { |
59 | 59 | $this->msg(sprintf('Adding records from "%1$s"', basename($filename)), 1); |
60 | 60 | |
61 | - if( ( $content = file_get_contents( $filename ) ) === false ) { |
|
62 | - throw new \Aimeos\MW\Setup\Exception( sprintf( 'Unable to get content from file "%1$s"', $filename ) ); |
|
61 | + if (($content = file_get_contents($filename)) === false) { |
|
62 | + throw new \Aimeos\MW\Setup\Exception(sprintf('Unable to get content from file "%1$s"', $filename)); |
|
63 | 63 | } |
64 | 64 | |
65 | - $this->execute( $content ); |
|
66 | - $this->status( 'done' ); |
|
65 | + $this->execute($content); |
|
66 | + $this->status('done'); |
|
67 | 67 | } |
68 | 68 | } |
@@ -5,15 +5,15 @@ |
||
5 | 5 | * @copyright Aimeos (aimeos.org), 2014 |
6 | 6 | */ |
7 | 7 | |
8 | -return array ( |
|
9 | - 'customer/lists/type' => array ( |
|
10 | - 'text/default' => array( 'domain' => 'text', 'code' => 'default', 'label' => 'Standard', 'status' => 1 ), |
|
8 | +return array( |
|
9 | + 'customer/lists/type' => array( |
|
10 | + 'text/default' => array('domain' => 'text', 'code' => 'default', 'label' => 'Standard', 'status' => 1), |
|
11 | 11 | ), |
12 | 12 | |
13 | - 'customer/lists' => array ( |
|
14 | - array( 'parentid' => 'customer/unitCustomer3', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/information', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => array(), 'pos' => 0, 'status' => 1 ), |
|
15 | - array( 'parentid' => 'customer/unitCustomer3', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/notify', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => array(), 'pos' => 1, 'status' => 1 ), |
|
16 | - array( 'parentid' => 'customer/unitCustomer3', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/newsletter', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => array(), 'pos' => 2, 'status' => 1 ), |
|
17 | - array( 'parentid' => 'customer/unitCustomer1', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/information', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => array(), 'pos' => 3, 'status' => 1 ), |
|
13 | + 'customer/lists' => array( |
|
14 | + array('parentid' => 'customer/unitCustomer3', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/information', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => array(), 'pos' => 0, 'status' => 1), |
|
15 | + array('parentid' => 'customer/unitCustomer3', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/notify', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => array(), 'pos' => 1, 'status' => 1), |
|
16 | + array('parentid' => 'customer/unitCustomer3', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/newsletter', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => array(), 'pos' => 2, 'status' => 1), |
|
17 | + array('parentid' => 'customer/unitCustomer1', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/information', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => array(), 'pos' => 3, 'status' => 1), |
|
18 | 18 | ), |
19 | 19 | ); |
@@ -5,11 +5,11 @@ |
||
5 | 5 | * @copyright Aimeos (aimeos.org), 2014 |
6 | 6 | */ |
7 | 7 | |
8 | -return array ( |
|
9 | - 'customer/address' => array ( |
|
10 | - array ( 'parentid' => 'customer/unitCustomer1', 'company' => 'ABC', 'vatid' => 'DE999999999', 'salutation' => 'mr', 'title' => 'Dr', 'firstname' => 'Our', 'lastname' => 'Unittest', 'address1' => 'Pickhuben', 'address2' => '2-4', 'address3' => '', 'postal' => '20457', 'city' => 'Hamburg', 'state' => 'Hamburg', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '055544332211', 'email' => '[email protected]', 'telefax' => '055544332212', 'website' => 'unittest.aimeos.org', 'flag' => 0, 'pos' => '0' ), |
|
11 | - array ( 'parentid' => 'customer/unitCustomer2', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'salutation' => 'mr', 'title' => 'Dr.', 'firstname' => 'Good', 'lastname' => 'Unittest', 'address1' => 'Pickhuben', 'address2' => '2-4', 'address3' => '', 'postal' => '20457', 'city' => 'Hamburg', 'state' => 'Hamburg', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '055544332211', 'email' => '[email protected]', 'telefax' => '055544332212', 'website' => 'unittest.aimeos.org', 'flag' => 0, 'pos' => '1' ), |
|
12 | - array ( 'parentid' => 'customer/unitCustomer2', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'salutation' => 'mr', 'title' => 'Dr.', 'firstname' => 'Good', 'lastname' => 'Unittest', 'address1' => 'Pickhuben', 'address2' => '2-4', 'address3' => '', 'postal' => '11099', 'city' => 'Berlin', 'state' => 'Berlin', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '055544332221', 'email' => '[email protected]', 'telefax' => '055544333212', 'website' => 'unittest.aimeos.org', 'flag' => 0, 'pos' => '1' ), |
|
13 | - array ( 'parentid' => 'customer/unitCustomer3', 'company' => 'unitcompany', 'vatid' => 'DE999999999', 'salutation' => 'company', 'title' => 'unittitle', 'firstname' => 'unitfirstname', 'lastname' => 'unitlastname', 'address1' => 'unitaddress1', 'address2' => 'unitaddress2', 'address3' => 'unitaddress3', 'postal' => 'unitpostal', 'city' => 'unitcity', 'state' => 'unitstate', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '1234567890', 'email' => '[email protected]', 'telefax' => '1234567891', 'website' => 'unittest.aimeos.org', 'flag' => 0, 'pos' => '2' ), |
|
8 | +return array( |
|
9 | + 'customer/address' => array( |
|
10 | + array('parentid' => 'customer/unitCustomer1', 'company' => 'ABC', 'vatid' => 'DE999999999', 'salutation' => 'mr', 'title' => 'Dr', 'firstname' => 'Our', 'lastname' => 'Unittest', 'address1' => 'Pickhuben', 'address2' => '2-4', 'address3' => '', 'postal' => '20457', 'city' => 'Hamburg', 'state' => 'Hamburg', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '055544332211', 'email' => '[email protected]', 'telefax' => '055544332212', 'website' => 'unittest.aimeos.org', 'flag' => 0, 'pos' => '0'), |
|
11 | + array('parentid' => 'customer/unitCustomer2', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'salutation' => 'mr', 'title' => 'Dr.', 'firstname' => 'Good', 'lastname' => 'Unittest', 'address1' => 'Pickhuben', 'address2' => '2-4', 'address3' => '', 'postal' => '20457', 'city' => 'Hamburg', 'state' => 'Hamburg', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '055544332211', 'email' => '[email protected]', 'telefax' => '055544332212', 'website' => 'unittest.aimeos.org', 'flag' => 0, 'pos' => '1'), |
|
12 | + array('parentid' => 'customer/unitCustomer2', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'salutation' => 'mr', 'title' => 'Dr.', 'firstname' => 'Good', 'lastname' => 'Unittest', 'address1' => 'Pickhuben', 'address2' => '2-4', 'address3' => '', 'postal' => '11099', 'city' => 'Berlin', 'state' => 'Berlin', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '055544332221', 'email' => '[email protected]', 'telefax' => '055544333212', 'website' => 'unittest.aimeos.org', 'flag' => 0, 'pos' => '1'), |
|
13 | + array('parentid' => 'customer/unitCustomer3', 'company' => 'unitcompany', 'vatid' => 'DE999999999', 'salutation' => 'company', 'title' => 'unittitle', 'firstname' => 'unitfirstname', 'lastname' => 'unitlastname', 'address1' => 'unitaddress1', 'address2' => 'unitaddress2', 'address3' => 'unitaddress3', 'postal' => 'unitpostal', 'city' => 'unitcity', 'state' => 'unitstate', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '1234567890', 'email' => '[email protected]', 'telefax' => '1234567891', 'website' => 'unittest.aimeos.org', 'flag' => 0, 'pos' => '2'), |
|
14 | 14 | ), |
15 | 15 | ); |
@@ -30,12 +30,12 @@ discard block |
||
30 | 30 | */ |
31 | 31 | public function getRoles() |
32 | 32 | { |
33 | - if( isset( $this->roles ) ) { |
|
33 | + if (isset($this->roles)) { |
|
34 | 34 | return $this->roles; |
35 | 35 | } |
36 | 36 | |
37 | 37 | $values = $this->getRawValues(); |
38 | - return ( isset( $values['roles'] ) ? (array) $values['roles'] : array() ); |
|
38 | + return (isset($values['roles']) ? (array) $values['roles'] : array()); |
|
39 | 39 | } |
40 | 40 | |
41 | 41 | |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | * |
45 | 45 | * @param array $roles List of Symfony roles |
46 | 46 | */ |
47 | - public function setRoles( array $roles ) |
|
47 | + public function setRoles(array $roles) |
|
48 | 48 | { |
49 | 49 | $this->roles = $roles; |
50 | 50 | $this->setModified(); |