@@ -5,18 +5,18 @@ |
||
5 | 5 | * @copyright Aimeos (aimeos.org), 2014-2016 |
6 | 6 | */ |
7 | 7 | |
8 | -return array ( |
|
9 | - 'customer/lists/type' => array ( |
|
10 | - 'customer/group/default' => array( 'domain' => 'customer/group', 'code' => 'default', 'label' => 'Standard', 'status' => 1 ), |
|
11 | - 'product/favorite' => array( 'domain' => 'product', 'code' => 'favorite', 'label' => 'Favorite', 'status' => 1 ), |
|
12 | - 'product/watch' => array( 'domain' => 'product', 'code' => 'watch', 'label' => 'Watch list', 'status' => 1 ), |
|
13 | - 'text/default' => array( 'domain' => 'text', 'code' => 'default', 'label' => 'Standard', 'status' => 1 ), |
|
8 | +return array( |
|
9 | + 'customer/lists/type' => array( |
|
10 | + 'customer/group/default' => array('domain' => 'customer/group', 'code' => 'default', 'label' => 'Standard', 'status' => 1), |
|
11 | + 'product/favorite' => array('domain' => 'product', 'code' => 'favorite', 'label' => 'Favorite', 'status' => 1), |
|
12 | + 'product/watch' => array('domain' => 'product', 'code' => 'watch', 'label' => 'Watch list', 'status' => 1), |
|
13 | + 'text/default' => array('domain' => 'text', 'code' => 'default', 'label' => 'Standard', 'status' => 1), |
|
14 | 14 | ), |
15 | 15 | |
16 | - 'customer/lists' => array ( |
|
17 | - 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' => [], 'pos' => 1, 'status' => 1 ), |
|
18 | - 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' => [], 'pos' => 2, 'status' => 1 ), |
|
19 | - 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' => [], 'pos' => 3, 'status' => 1 ), |
|
20 | - 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' => [], 'pos' => 1, 'status' => 1 ), |
|
16 | + 'customer/lists' => array( |
|
17 | + 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' => [], 'pos' => 1, 'status' => 1), |
|
18 | + 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' => [], 'pos' => 2, 'status' => 1), |
|
19 | + 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' => [], 'pos' => 3, 'status' => 1), |
|
20 | + 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' => [], 'pos' => 1, 'status' => 1), |
|
21 | 21 | ), |
22 | 22 | ); |
23 | 23 | \ No newline at end of file |
@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | */ |
22 | 22 | public function getPreDependencies() |
23 | 23 | { |
24 | - return array( 'TablesAddLaravelTestData' ); |
|
24 | + return array('TablesAddLaravelTestData'); |
|
25 | 25 | } |
26 | 26 | |
27 | 27 | |
@@ -31,36 +31,36 @@ discard block |
||
31 | 31 | public function migrate() |
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 Laravel customer test data', 0 ); |
|
39 | - $this->additional->setEditor( 'ai-laravel:unittest' ); |
|
38 | + $this->msg('Adding Laravel customer test data', 0); |
|
39 | + $this->additional->setEditor('ai-laravel:unittest'); |
|
40 | 40 | |
41 | 41 | $parentIds = []; |
42 | 42 | $ds = DIRECTORY_SEPARATOR; |
43 | - $path = __DIR__ . $ds . 'data' . $ds . 'customer.php'; |
|
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, 'Laravel' ); |
|
51 | - $customerAddressManager = $customerManager->getSubManager( 'address', 'Laravel' ); |
|
50 | + $customerManager = \Aimeos\MShop\Customer\Manager\Factory::createManager($this->additional, 'Laravel'); |
|
51 | + $customerAddressManager = $customerManager->getSubManager('address', 'Laravel'); |
|
52 | 52 | |
53 | - $this->cleanupCustomerData( $customerManager, $customerAddressManager ); |
|
53 | + $this->cleanupCustomerData($customerManager, $customerAddressManager); |
|
54 | 54 | |
55 | 55 | $this->conn->begin(); |
56 | 56 | |
57 | - $parentIds = $this->addCustomerData( $testdata, $customerManager, $customerAddressManager->createItem() ); |
|
58 | - $this->addCustomerAddressData( $testdata, $customerAddressManager, $parentIds ); |
|
57 | + $parentIds = $this->addCustomerData($testdata, $customerManager, $customerAddressManager->createItem()); |
|
58 | + $this->addCustomerAddressData($testdata, $customerAddressManager, $parentIds); |
|
59 | 59 | |
60 | 60 | $this->conn->commit(); |
61 | 61 | |
62 | 62 | |
63 | - $this->status( 'done' ); |
|
63 | + $this->status('done'); |
|
64 | 64 | } |
65 | 65 | |
66 | 66 | |
@@ -70,17 +70,17 @@ discard block |
||
70 | 70 | * @param \Aimeos\MShop\Common\Manager\Iface $customerManager Customer manager |
71 | 71 | * @param \Aimeos\MShop\Common\Manager\Iface $customerAddressManager Customer address manager |
72 | 72 | */ |
73 | - protected function cleanupCustomerData( \Aimeos\MShop\Common\Manager\Iface $customerManager, \Aimeos\MShop\Common\Manager\Iface $customerAddressManager ) |
|
73 | + protected function cleanupCustomerData(\Aimeos\MShop\Common\Manager\Iface $customerManager, \Aimeos\MShop\Common\Manager\Iface $customerAddressManager) |
|
74 | 74 | { |
75 | 75 | $search = $customerManager->createSearch(); |
76 | - $search->setConditions( $search->compare( '=~', 'customer.code', 'unitCustomer' ) ); |
|
77 | - $customerItems = $customerManager->searchItems( $search ); |
|
76 | + $search->setConditions($search->compare('=~', 'customer.code', 'unitCustomer')); |
|
77 | + $customerItems = $customerManager->searchItems($search); |
|
78 | 78 | |
79 | 79 | $search = $customerAddressManager->createSearch(); |
80 | - $search->setConditions( $search->compare( '=~', 'customer.address.email', 'unitCustomer' ) ); |
|
81 | - $addressItems = $customerAddressManager->searchItems( $search ); |
|
80 | + $search->setConditions($search->compare('=~', 'customer.address.email', 'unitCustomer')); |
|
81 | + $addressItems = $customerAddressManager->searchItems($search); |
|
82 | 82 | |
83 | - $customerAddressManager->deleteItems( array_keys( $addressItems ) ); |
|
84 | - $customerManager->deleteItems( array_keys( $customerItems ) ); |
|
83 | + $customerAddressManager->deleteItems(array_keys($addressItems)); |
|
84 | + $customerManager->deleteItems(array_keys($customerItems)); |
|
85 | 85 | } |
86 | 86 | } |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | */ |
23 | 23 | public function getPreDependencies() |
24 | 24 | { |
25 | - return array( 'TablesCreateLaravel', 'CustomerAddLaravelTestData', 'LocaleAddTestData', 'TextAddTestData' ); |
|
25 | + return array('TablesCreateLaravel', 'CustomerAddLaravelTestData', 'LocaleAddTestData', 'TextAddTestData'); |
|
26 | 26 | } |
27 | 27 | |
28 | 28 | |
@@ -32,29 +32,29 @@ discard block |
||
32 | 32 | public function migrate() |
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 Laravel test data', 0 ); |
|
40 | - $this->additional->setEditor( 'ai-laravel:unittest' ); |
|
39 | + $this->msg('Adding customer-list Laravel test data', 0); |
|
40 | + $this->additional->setEditor('ai-laravel:unittest'); |
|
41 | 41 | |
42 | 42 | $ds = DIRECTORY_SEPARATOR; |
43 | - $path = __DIR__ . $ds . 'data' . $ds . 'customer-list.php'; |
|
43 | + $path = __DIR__.$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 = []; |
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 = []; |
55 | - $refIds['text'] = $this->getTextData( $refKeys['text'] ); |
|
56 | - $this->addCustomerListData( $testdata, $refIds, 'Laravel' ); |
|
55 | + $refIds['text'] = $this->getTextData($refKeys['text']); |
|
56 | + $this->addCustomerListData($testdata, $refIds, 'Laravel'); |
|
57 | 57 | |
58 | - $this->status( 'done' ); |
|
58 | + $this->status('done'); |
|
59 | 59 | } |
60 | 60 | } |
61 | 61 | \ No newline at end of file |
@@ -8,152 +8,152 @@ |
||
8 | 8 | |
9 | 9 | return array( |
10 | 10 | 'table' => array( |
11 | - 'users' => function ( \Doctrine\DBAL\Schema\Schema $schema ) { |
|
12 | - |
|
13 | - $table = $schema->createTable( 'users' ); |
|
14 | - |
|
15 | - $table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) ); |
|
16 | - $table->addColumn( 'label', 'string', array( 'length' => 255, 'default' => '' ) ); |
|
17 | - $table->addColumn( 'name', 'string', array( 'length' => 255 ) ); |
|
18 | - $table->addColumn( 'remember_token', 'string', array( 'length' => 100, 'notnull' => false ) ); |
|
19 | - $table->addColumn( 'salutation', 'string', array( 'length' => 8, 'default' => '' ) ); |
|
20 | - $table->addColumn( 'company', 'string', array( 'length' => 100, 'default' => '' ) ); |
|
21 | - $table->addColumn( 'vatid', 'string', array( 'length' => 32, 'default' => '' ) ); |
|
22 | - $table->addColumn( 'title', 'string', array( 'length' => 64, 'default' => '' ) ); |
|
23 | - $table->addColumn( 'firstname', 'string', array( 'length' => 64, 'default' => '' ) ); |
|
24 | - $table->addColumn( 'lastname', 'string', array( 'length' => 64, 'default' => '' ) ); |
|
25 | - $table->addColumn( 'address1', 'string', array( 'length' => 200, 'default' => '' ) ); |
|
26 | - $table->addColumn( 'address2', 'string', array( 'length' => 200, 'default' => '' ) ); |
|
27 | - $table->addColumn( 'address3', 'string', array( 'length' => 200, 'default' => '' ) ); |
|
28 | - $table->addColumn( 'postal', 'string', array( 'length' => 16, 'default' => '' ) ); |
|
29 | - $table->addColumn( 'city', 'string', array( 'length' => 200, 'default' => '' ) ); |
|
30 | - $table->addColumn( 'state', 'string', array( 'length' => 200, 'default' => '' ) ); |
|
31 | - $table->addColumn( 'langid', 'string', array( 'length' => 5, 'notnull' => false ) ); |
|
32 | - $table->addColumn( 'countryid', 'string', array( 'length' => 2, 'notnull' => false, 'fixed' => true ) ); |
|
33 | - $table->addColumn( 'telephone', 'string', array( 'length' => 32, 'default' => '' ) ); |
|
34 | - $table->addColumn( 'telefax', 'string', array( 'length' => 32, 'default' => '' ) ); |
|
35 | - $table->addColumn( 'website', 'string', array( 'length' => 255, 'default' => '' ) ); |
|
36 | - $table->addColumn( 'email', 'string', array( 'length' => 255 ) ); |
|
37 | - $table->addColumn( 'password', 'string', array( 'length' => 255 ) ); |
|
38 | - $table->addColumn( 'longitude', 'decimal', array( 'precision' => 8, 'scale' => 6, 'notnull' => false ) ); |
|
39 | - $table->addColumn( 'latitude', 'decimal', array( 'precision' => 8, 'scale' => 6, 'notnull' => false ) ); |
|
40 | - $table->addColumn( 'birthday', 'date', array( 'notnull' => false ) ); |
|
41 | - $table->addColumn( 'vdate', 'date', array( 'notnull' => false ) ); |
|
42 | - $table->addColumn( 'status', 'smallint', array( 'default' => 1 ) ); |
|
43 | - $table->addColumn( 'updated_at', 'datetime', [] ); |
|
44 | - $table->addColumn( 'created_at', 'datetime', [] ); |
|
45 | - $table->addColumn( 'editor', 'string', array('length' => 255, 'default' => '' ) ); |
|
46 | - |
|
47 | - $table->setPrimaryKey( array( 'id' ), 'pk_lvusr_id' ); |
|
48 | - $table->addUniqueIndex( array( 'email' ), 'unq_lvusr_email' ); |
|
49 | - $table->addIndex( array( 'langid' ), 'idx_lvusr_langid' ); |
|
50 | - $table->addIndex( array( 'lastname', 'firstname' ), 'idx_lvusr_last_first' ); |
|
51 | - $table->addIndex( array( 'postal', 'address1' ), 'idx_lvusr_post_addr1' ); |
|
52 | - $table->addIndex( array( 'postal', 'city' ), 'idx_lvusr_post_city' ); |
|
53 | - $table->addIndex( array( 'lastname' ), 'idx_lvusr_lastname' ); |
|
54 | - $table->addIndex( array( 'address1' ), 'idx_lvusr_address1' ); |
|
55 | - $table->addIndex( array( 'city' ), 'idx_lvusr_city' ); |
|
11 | + 'users' => function(\Doctrine\DBAL\Schema\Schema $schema) { |
|
12 | + |
|
13 | + $table = $schema->createTable('users'); |
|
14 | + |
|
15 | + $table->addColumn('id', 'integer', array('autoincrement' => true)); |
|
16 | + $table->addColumn('label', 'string', array('length' => 255, 'default' => '')); |
|
17 | + $table->addColumn('name', 'string', array('length' => 255)); |
|
18 | + $table->addColumn('remember_token', 'string', array('length' => 100, 'notnull' => false)); |
|
19 | + $table->addColumn('salutation', 'string', array('length' => 8, 'default' => '')); |
|
20 | + $table->addColumn('company', 'string', array('length' => 100, 'default' => '')); |
|
21 | + $table->addColumn('vatid', 'string', array('length' => 32, 'default' => '')); |
|
22 | + $table->addColumn('title', 'string', array('length' => 64, 'default' => '')); |
|
23 | + $table->addColumn('firstname', 'string', array('length' => 64, 'default' => '')); |
|
24 | + $table->addColumn('lastname', 'string', array('length' => 64, 'default' => '')); |
|
25 | + $table->addColumn('address1', 'string', array('length' => 200, 'default' => '')); |
|
26 | + $table->addColumn('address2', 'string', array('length' => 200, 'default' => '')); |
|
27 | + $table->addColumn('address3', 'string', array('length' => 200, 'default' => '')); |
|
28 | + $table->addColumn('postal', 'string', array('length' => 16, 'default' => '')); |
|
29 | + $table->addColumn('city', 'string', array('length' => 200, 'default' => '')); |
|
30 | + $table->addColumn('state', 'string', array('length' => 200, 'default' => '')); |
|
31 | + $table->addColumn('langid', 'string', array('length' => 5, 'notnull' => false)); |
|
32 | + $table->addColumn('countryid', 'string', array('length' => 2, 'notnull' => false, 'fixed' => true)); |
|
33 | + $table->addColumn('telephone', 'string', array('length' => 32, 'default' => '')); |
|
34 | + $table->addColumn('telefax', 'string', array('length' => 32, 'default' => '')); |
|
35 | + $table->addColumn('website', 'string', array('length' => 255, 'default' => '')); |
|
36 | + $table->addColumn('email', 'string', array('length' => 255)); |
|
37 | + $table->addColumn('password', 'string', array('length' => 255)); |
|
38 | + $table->addColumn('longitude', 'decimal', array('precision' => 8, 'scale' => 6, 'notnull' => false)); |
|
39 | + $table->addColumn('latitude', 'decimal', array('precision' => 8, 'scale' => 6, 'notnull' => false)); |
|
40 | + $table->addColumn('birthday', 'date', array('notnull' => false)); |
|
41 | + $table->addColumn('vdate', 'date', array('notnull' => false)); |
|
42 | + $table->addColumn('status', 'smallint', array('default' => 1)); |
|
43 | + $table->addColumn('updated_at', 'datetime', []); |
|
44 | + $table->addColumn('created_at', 'datetime', []); |
|
45 | + $table->addColumn('editor', 'string', array('length' => 255, 'default' => '')); |
|
46 | + |
|
47 | + $table->setPrimaryKey(array('id'), 'pk_lvusr_id'); |
|
48 | + $table->addUniqueIndex(array('email'), 'unq_lvusr_email'); |
|
49 | + $table->addIndex(array('langid'), 'idx_lvusr_langid'); |
|
50 | + $table->addIndex(array('lastname', 'firstname'), 'idx_lvusr_last_first'); |
|
51 | + $table->addIndex(array('postal', 'address1'), 'idx_lvusr_post_addr1'); |
|
52 | + $table->addIndex(array('postal', 'city'), 'idx_lvusr_post_city'); |
|
53 | + $table->addIndex(array('lastname'), 'idx_lvusr_lastname'); |
|
54 | + $table->addIndex(array('address1'), 'idx_lvusr_address1'); |
|
55 | + $table->addIndex(array('city'), 'idx_lvusr_city'); |
|
56 | 56 | |
57 | 57 | return $schema; |
58 | 58 | }, |
59 | 59 | |
60 | - 'users_address' => function ( \Doctrine\DBAL\Schema\Schema $schema ) { |
|
61 | - |
|
62 | - $table = $schema->createTable( 'users_address' ); |
|
63 | - |
|
64 | - $table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) ); |
|
65 | - $table->addColumn( 'siteid', 'integer', [] ); |
|
66 | - $table->addColumn( 'parentid', 'integer', [] ); |
|
67 | - $table->addColumn( 'company', 'string', array( 'length' => 100 ) ); |
|
68 | - $table->addColumn( 'vatid', 'string', array( 'length' => 32 ) ); |
|
69 | - $table->addColumn( 'salutation', 'string', array( 'length' => 8 ) ); |
|
70 | - $table->addColumn( 'title', 'string', array( 'length' => 64 ) ); |
|
71 | - $table->addColumn( 'firstname', 'string', array( 'length' => 64 ) ); |
|
72 | - $table->addColumn( 'lastname', 'string', array( 'length' => 64 ) ); |
|
73 | - $table->addColumn( 'address1', 'string', array( 'length' => 200 ) ); |
|
74 | - $table->addColumn( 'address2', 'string', array( 'length' => 200 ) ); |
|
75 | - $table->addColumn( 'address3', 'string', array( 'length' => 200 ) ); |
|
76 | - $table->addColumn( 'postal', 'string', array( 'length' => 16 ) ); |
|
77 | - $table->addColumn( 'city', 'string', array( 'length' => 200 ) ); |
|
78 | - $table->addColumn( 'state', 'string', array( 'length' => 200 ) ); |
|
79 | - $table->addColumn( 'langid', 'string', array( 'length' => 5, 'notnull' => false ) ); |
|
80 | - $table->addColumn( 'countryid', 'string', array( 'length' => 2, 'notnull' => false, 'fixed' => true ) ); |
|
81 | - $table->addColumn( 'telephone', 'string', array( 'length' => 32 ) ); |
|
82 | - $table->addColumn( 'email', 'string', array( 'length' => 255 ) ); |
|
83 | - $table->addColumn( 'telefax', 'string', array( 'length' => 255 ) ); |
|
84 | - $table->addColumn( 'website', 'string', array( 'length' => 255 ) ); |
|
85 | - $table->addColumn( 'longitude', 'decimal', array( 'precision' => 8, 'scale' => 6, 'notnull' => false ) ); |
|
86 | - $table->addColumn( 'latitude', 'decimal', array( 'precision' => 8, 'scale' => 6, 'notnull' => false ) ); |
|
87 | - $table->addColumn( 'flag', 'integer', [] ); |
|
88 | - $table->addColumn( 'pos', 'smallint', [] ); |
|
89 | - $table->addColumn( 'mtime', 'datetime', [] ); |
|
90 | - $table->addColumn( 'ctime', 'datetime', [] ); |
|
91 | - $table->addColumn( 'editor', 'string', array('length' => 255 ) ); |
|
92 | - |
|
93 | - $table->setPrimaryKey( array( 'id' ), 'pk_lvuad_id' ); |
|
94 | - $table->addIndex( array( 'parentid' ), 'idx_lvuad_pid' ); |
|
95 | - $table->addIndex( array( 'lastname', 'firstname' ), 'idx_lvuad_last_first' ); |
|
96 | - $table->addIndex( array( 'postal', 'address1' ), 'idx_lvuad_post_addr1' ); |
|
97 | - $table->addIndex( array( 'postal', 'city' ), 'idx_lvuad_post_city' ); |
|
98 | - $table->addIndex( array( 'address1' ), 'idx_lvusr_address1' ); |
|
99 | - $table->addIndex( array( 'city' ), 'idx_lvuad_city' ); |
|
100 | - $table->addIndex( array( 'email' ), 'idx_lvuad_email' ); |
|
60 | + 'users_address' => function(\Doctrine\DBAL\Schema\Schema $schema) { |
|
61 | + |
|
62 | + $table = $schema->createTable('users_address'); |
|
63 | + |
|
64 | + $table->addColumn('id', 'integer', array('autoincrement' => true)); |
|
65 | + $table->addColumn('siteid', 'integer', []); |
|
66 | + $table->addColumn('parentid', 'integer', []); |
|
67 | + $table->addColumn('company', 'string', array('length' => 100)); |
|
68 | + $table->addColumn('vatid', 'string', array('length' => 32)); |
|
69 | + $table->addColumn('salutation', 'string', array('length' => 8)); |
|
70 | + $table->addColumn('title', 'string', array('length' => 64)); |
|
71 | + $table->addColumn('firstname', 'string', array('length' => 64)); |
|
72 | + $table->addColumn('lastname', 'string', array('length' => 64)); |
|
73 | + $table->addColumn('address1', 'string', array('length' => 200)); |
|
74 | + $table->addColumn('address2', 'string', array('length' => 200)); |
|
75 | + $table->addColumn('address3', 'string', array('length' => 200)); |
|
76 | + $table->addColumn('postal', 'string', array('length' => 16)); |
|
77 | + $table->addColumn('city', 'string', array('length' => 200)); |
|
78 | + $table->addColumn('state', 'string', array('length' => 200)); |
|
79 | + $table->addColumn('langid', 'string', array('length' => 5, 'notnull' => false)); |
|
80 | + $table->addColumn('countryid', 'string', array('length' => 2, 'notnull' => false, 'fixed' => true)); |
|
81 | + $table->addColumn('telephone', 'string', array('length' => 32)); |
|
82 | + $table->addColumn('email', 'string', array('length' => 255)); |
|
83 | + $table->addColumn('telefax', 'string', array('length' => 255)); |
|
84 | + $table->addColumn('website', 'string', array('length' => 255)); |
|
85 | + $table->addColumn('longitude', 'decimal', array('precision' => 8, 'scale' => 6, 'notnull' => false)); |
|
86 | + $table->addColumn('latitude', 'decimal', array('precision' => 8, 'scale' => 6, 'notnull' => false)); |
|
87 | + $table->addColumn('flag', 'integer', []); |
|
88 | + $table->addColumn('pos', 'smallint', []); |
|
89 | + $table->addColumn('mtime', 'datetime', []); |
|
90 | + $table->addColumn('ctime', 'datetime', []); |
|
91 | + $table->addColumn('editor', 'string', array('length' => 255)); |
|
92 | + |
|
93 | + $table->setPrimaryKey(array('id'), 'pk_lvuad_id'); |
|
94 | + $table->addIndex(array('parentid'), 'idx_lvuad_pid'); |
|
95 | + $table->addIndex(array('lastname', 'firstname'), 'idx_lvuad_last_first'); |
|
96 | + $table->addIndex(array('postal', 'address1'), 'idx_lvuad_post_addr1'); |
|
97 | + $table->addIndex(array('postal', 'city'), 'idx_lvuad_post_city'); |
|
98 | + $table->addIndex(array('address1'), 'idx_lvusr_address1'); |
|
99 | + $table->addIndex(array('city'), 'idx_lvuad_city'); |
|
100 | + $table->addIndex(array('email'), 'idx_lvuad_email'); |
|
101 | 101 | |
102 | 102 | return $schema; |
103 | 103 | }, |
104 | 104 | |
105 | - 'users_list_type' => function ( \Doctrine\DBAL\Schema\Schema $schema ) { |
|
105 | + 'users_list_type' => function(\Doctrine\DBAL\Schema\Schema $schema) { |
|
106 | 106 | |
107 | - $table = $schema->createTable( 'users_list_type' ); |
|
107 | + $table = $schema->createTable('users_list_type'); |
|
108 | 108 | |
109 | - $table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) ); |
|
110 | - $table->addColumn( 'siteid', 'integer', [] ); |
|
111 | - $table->addColumn( 'domain', 'string', array( 'length' => 32 ) ); |
|
112 | - $table->addColumn( 'code', 'string', array( 'length' => 32 ) ); |
|
113 | - $table->addColumn( 'label', 'string', array( 'length' => 255 ) ); |
|
114 | - $table->addColumn( 'status', 'smallint', [] ); |
|
115 | - $table->addColumn( 'mtime', 'datetime', [] ); |
|
116 | - $table->addColumn( 'ctime', 'datetime', [] ); |
|
117 | - $table->addColumn( 'editor', 'string', array( 'length' => 255 ) ); |
|
109 | + $table->addColumn('id', 'integer', array('autoincrement' => true)); |
|
110 | + $table->addColumn('siteid', 'integer', []); |
|
111 | + $table->addColumn('domain', 'string', array('length' => 32)); |
|
112 | + $table->addColumn('code', 'string', array('length' => 32)); |
|
113 | + $table->addColumn('label', 'string', array('length' => 255)); |
|
114 | + $table->addColumn('status', 'smallint', []); |
|
115 | + $table->addColumn('mtime', 'datetime', []); |
|
116 | + $table->addColumn('ctime', 'datetime', []); |
|
117 | + $table->addColumn('editor', 'string', array('length' => 255)); |
|
118 | 118 | |
119 | - $table->setPrimaryKey( array( 'id' ), 'pk_lvulity_id' ); |
|
120 | - $table->addUniqueIndex( array( 'siteid', 'domain', 'code' ), 'unq_lvulity_sid_dom_code' ); |
|
121 | - $table->addIndex( array( 'siteid', 'status' ), 'idx_lvulity_sid_status' ); |
|
122 | - $table->addIndex( array( 'siteid', 'label' ), 'idx_lvulity_sid_label' ); |
|
123 | - $table->addIndex( array( 'siteid', 'code' ), 'idx_lvulity_sid_code' ); |
|
119 | + $table->setPrimaryKey(array('id'), 'pk_lvulity_id'); |
|
120 | + $table->addUniqueIndex(array('siteid', 'domain', 'code'), 'unq_lvulity_sid_dom_code'); |
|
121 | + $table->addIndex(array('siteid', 'status'), 'idx_lvulity_sid_status'); |
|
122 | + $table->addIndex(array('siteid', 'label'), 'idx_lvulity_sid_label'); |
|
123 | + $table->addIndex(array('siteid', 'code'), 'idx_lvulity_sid_code'); |
|
124 | 124 | |
125 | 125 | return $schema; |
126 | 126 | }, |
127 | 127 | |
128 | - 'users_list' => function ( \Doctrine\DBAL\Schema\Schema $schema ) { |
|
129 | - |
|
130 | - $table = $schema->createTable( 'users_list' ); |
|
131 | - |
|
132 | - $table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) ); |
|
133 | - $table->addColumn( 'parentid', 'integer', [] ); |
|
134 | - $table->addColumn( 'siteid', 'integer', [] ); |
|
135 | - $table->addColumn( 'typeid', 'integer', [] ); |
|
136 | - $table->addColumn( 'domain', 'string', array( 'length' => 32 ) ); |
|
137 | - $table->addColumn( 'refid', 'string', array( 'length' => 32 ) ); |
|
138 | - $table->addColumn( 'start', 'datetime', array( 'notnull' => false ) ); |
|
139 | - $table->addColumn( 'end', 'datetime', array( 'notnull' => false ) ); |
|
140 | - $table->addColumn( 'config', 'text', array( 'length' => 0xffff ) ); |
|
141 | - $table->addColumn( 'pos', 'integer', [] ); |
|
142 | - $table->addColumn( 'status', 'smallint', [] ); |
|
143 | - $table->addColumn( 'mtime', 'datetime', [] ); |
|
144 | - $table->addColumn( 'ctime', 'datetime', [] ); |
|
145 | - $table->addColumn( 'editor', 'string', array( 'length' => 255 ) ); |
|
146 | - |
|
147 | - $table->setPrimaryKey( array( 'id' ), 'pk_lvuli_id' ); |
|
148 | - $table->addUniqueIndex( array( 'siteid', 'domain', 'refid', 'typeid', 'parentid' ), 'unq_lvuli_sid_dm_rid_tid_pid' ); |
|
149 | - $table->addIndex( array( 'siteid', 'status', 'start', 'end' ), 'idx_lvuli_sid_stat_start_end' ); |
|
150 | - $table->addIndex( array( 'parentid', 'siteid', 'refid', 'domain', 'typeid' ), 'idx_lvuli_pid_sid_rid_dom_tid' ); |
|
151 | - $table->addIndex( array( 'parentid', 'siteid', 'start' ), 'idx_lvuli_pid_sid_start' ); |
|
152 | - $table->addIndex( array( 'parentid', 'siteid', 'end' ), 'idx_lvuli_pid_sid_end' ); |
|
153 | - $table->addIndex( array( 'parentid', 'siteid', 'pos' ), 'idx_lvuli_pid_sid_pos' ); |
|
154 | - |
|
155 | - $table->addForeignKeyConstraint( 'users_list_type', array( 'typeid' ), array( 'id' ), |
|
156 | - array( 'onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE' ), 'fk_lvuli_typeid' ); |
|
128 | + 'users_list' => function(\Doctrine\DBAL\Schema\Schema $schema) { |
|
129 | + |
|
130 | + $table = $schema->createTable('users_list'); |
|
131 | + |
|
132 | + $table->addColumn('id', 'integer', array('autoincrement' => true)); |
|
133 | + $table->addColumn('parentid', 'integer', []); |
|
134 | + $table->addColumn('siteid', 'integer', []); |
|
135 | + $table->addColumn('typeid', 'integer', []); |
|
136 | + $table->addColumn('domain', 'string', array('length' => 32)); |
|
137 | + $table->addColumn('refid', 'string', array('length' => 32)); |
|
138 | + $table->addColumn('start', 'datetime', array('notnull' => false)); |
|
139 | + $table->addColumn('end', 'datetime', array('notnull' => false)); |
|
140 | + $table->addColumn('config', 'text', array('length' => 0xffff)); |
|
141 | + $table->addColumn('pos', 'integer', []); |
|
142 | + $table->addColumn('status', 'smallint', []); |
|
143 | + $table->addColumn('mtime', 'datetime', []); |
|
144 | + $table->addColumn('ctime', 'datetime', []); |
|
145 | + $table->addColumn('editor', 'string', array('length' => 255)); |
|
146 | + |
|
147 | + $table->setPrimaryKey(array('id'), 'pk_lvuli_id'); |
|
148 | + $table->addUniqueIndex(array('siteid', 'domain', 'refid', 'typeid', 'parentid'), 'unq_lvuli_sid_dm_rid_tid_pid'); |
|
149 | + $table->addIndex(array('siteid', 'status', 'start', 'end'), 'idx_lvuli_sid_stat_start_end'); |
|
150 | + $table->addIndex(array('parentid', 'siteid', 'refid', 'domain', 'typeid'), 'idx_lvuli_pid_sid_rid_dom_tid'); |
|
151 | + $table->addIndex(array('parentid', 'siteid', 'start'), 'idx_lvuli_pid_sid_start'); |
|
152 | + $table->addIndex(array('parentid', 'siteid', 'end'), 'idx_lvuli_pid_sid_end'); |
|
153 | + $table->addIndex(array('parentid', 'siteid', 'pos'), 'idx_lvuli_pid_sid_pos'); |
|
154 | + |
|
155 | + $table->addForeignKeyConstraint('users_list_type', array('typeid'), array('id'), |
|
156 | + array('onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE'), 'fk_lvuli_typeid'); |
|
157 | 157 | |
158 | 158 | return $schema; |
159 | 159 | }, |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | * |
30 | 30 | * @param \Illuminate\Contracts\Cache\Store $cache Laravel cache object |
31 | 31 | */ |
32 | - public function __construct( \Illuminate\Contracts\Cache\Store $cache ) |
|
32 | + public function __construct(\Illuminate\Contracts\Cache\Store $cache) |
|
33 | 33 | { |
34 | 34 | $this->object = $cache; |
35 | 35 | } |
@@ -53,9 +53,9 @@ discard block |
||
53 | 53 | * |
54 | 54 | * @param string $key Key string that identifies the single cache entry |
55 | 55 | */ |
56 | - public function delete( $key ) |
|
56 | + public function delete($key) |
|
57 | 57 | { |
58 | - $this->object->forget( $key ); |
|
58 | + $this->object->forget($key); |
|
59 | 59 | } |
60 | 60 | |
61 | 61 | |
@@ -67,10 +67,10 @@ discard block |
||
67 | 67 | * @param \Traversable|array $keys List of key strings that identify the cache entries |
68 | 68 | * that should be removed |
69 | 69 | */ |
70 | - public function deleteMultiple( $keys ) |
|
70 | + public function deleteMultiple($keys) |
|
71 | 71 | { |
72 | - foreach( $keys as $key ) { |
|
73 | - $this->object->forget( $key ); |
|
72 | + foreach ($keys as $key) { |
|
73 | + $this->object->forget($key); |
|
74 | 74 | } |
75 | 75 | } |
76 | 76 | |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | * @param string[] $tags List of tag strings that are associated to one or more |
84 | 84 | * cache entries that should be removed |
85 | 85 | */ |
86 | - public function deleteByTags( array $tags ) |
|
86 | + public function deleteByTags(array $tags) |
|
87 | 87 | { |
88 | 88 | // $this->object->tags( $tag )->flush(); |
89 | 89 | $this->object->flush(); |
@@ -99,9 +99,9 @@ discard block |
||
99 | 99 | * @param string $default Value returned if requested key isn't found |
100 | 100 | * @return mixed Value associated to the requested key |
101 | 101 | */ |
102 | - public function get( $name, $default = null ) |
|
102 | + public function get($name, $default = null) |
|
103 | 103 | { |
104 | - if( ( $entry = $this->object->get( $name ) ) !== null ) { |
|
104 | + if (($entry = $this->object->get($name)) !== null) { |
|
105 | 105 | return $entry; |
106 | 106 | } |
107 | 107 | |
@@ -120,13 +120,13 @@ discard block |
||
120 | 120 | * entries. If a cache entry doesn't exist, neither its key nor a value |
121 | 121 | * will be in the result list |
122 | 122 | */ |
123 | - public function getMultiple( $keys, $default = null ) |
|
123 | + public function getMultiple($keys, $default = null) |
|
124 | 124 | { |
125 | 125 | $result = []; |
126 | 126 | |
127 | - foreach( $keys as $key ) |
|
127 | + foreach ($keys as $key) |
|
128 | 128 | { |
129 | - if( ( $entry = $this->object->get( $key ) ) !== false ) { |
|
129 | + if (($entry = $this->object->get($key)) !== false) { |
|
130 | 130 | $result[$key] = $entry; |
131 | 131 | } else { |
132 | 132 | $result[$key] = $default; |
@@ -147,7 +147,7 @@ discard block |
||
147 | 147 | * entries. If a tag isn't associated to any cache entry, nothing is returned |
148 | 148 | * for that tag |
149 | 149 | */ |
150 | - public function getMultipleByTags( array $tags ) |
|
150 | + public function getMultipleByTags(array $tags) |
|
151 | 151 | { |
152 | 152 | return []; |
153 | 153 | } |
@@ -165,14 +165,14 @@ discard block |
||
165 | 165 | * @param array $tags List of tag strings that should be assoicated to the |
166 | 166 | * given value in the cache |
167 | 167 | */ |
168 | - public function set( $key, $value, $expires = null, array $tags = [] ) |
|
168 | + public function set($key, $value, $expires = null, array $tags = []) |
|
169 | 169 | { |
170 | - if( is_string( $expires ) ) { |
|
171 | - $this->object->put( $key, $value, (int) ( date_create( $expires )->getTimestamp() - time() ) / 60 ); |
|
172 | - } elseif( is_int( $expires ) ) { |
|
173 | - $this->object->put( $key, $value, (int) $expires / 60 ); |
|
170 | + if (is_string($expires)) { |
|
171 | + $this->object->put($key, $value, (int) (date_create($expires)->getTimestamp() - time())/60); |
|
172 | + } elseif (is_int($expires)) { |
|
173 | + $this->object->put($key, $value, (int) $expires/60); |
|
174 | 174 | } else { |
175 | - $this->object->forever( $key, $value ); |
|
175 | + $this->object->forever($key, $value); |
|
176 | 176 | } |
177 | 177 | } |
178 | 178 | |
@@ -191,14 +191,14 @@ discard block |
||
191 | 191 | * should be associated to the values identified by their key. The value |
192 | 192 | * associated to the key can either be a tag string or an array of tag strings |
193 | 193 | */ |
194 | - public function setMultiple( $pairs, $expires = null, array $tags = [] ) |
|
194 | + public function setMultiple($pairs, $expires = null, array $tags = []) |
|
195 | 195 | { |
196 | - foreach( $pairs as $key => $value ) |
|
196 | + foreach ($pairs as $key => $value) |
|
197 | 197 | { |
198 | - $tagList = ( isset( $tags[$key] ) ? (array) $tags[$key] : [] ); |
|
199 | - $keyExpire = ( isset( $expires[$key] ) ? $expires[$key] : null ); |
|
198 | + $tagList = (isset($tags[$key]) ? (array) $tags[$key] : []); |
|
199 | + $keyExpire = (isset($expires[$key]) ? $expires[$key] : null); |
|
200 | 200 | |
201 | - $this->set( $key, $value, $keyExpire, $tagList ); |
|
201 | + $this->set($key, $value, $keyExpire, $tagList); |
|
202 | 202 | } |
203 | 203 | } |
204 | 204 | } |
@@ -34,11 +34,11 @@ discard block |
||
34 | 34 | * @param \\Aimeos\MW\View\Iface $view View instance with registered view helpers |
35 | 35 | * @param \Illuminate\Http\Request $request Laravel request object |
36 | 36 | */ |
37 | - public function __construct( \Aimeos\MW\View\Iface $view, \Illuminate\Http\Request $request ) |
|
37 | + public function __construct(\Aimeos\MW\View\Iface $view, \Illuminate\Http\Request $request) |
|
38 | 38 | { |
39 | 39 | $this->request = $request; |
40 | 40 | |
41 | - parent::__construct( $view, $this->createRequest( $request ) ); |
|
41 | + parent::__construct($view, $this->createRequest($request)); |
|
42 | 42 | } |
43 | 43 | |
44 | 44 | |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | */ |
61 | 61 | public function getTarget() |
62 | 62 | { |
63 | - if( ( $route = $this->request->route() ) !== null ) { |
|
63 | + if (($route = $this->request->route()) !== null) { |
|
64 | 64 | return $route->getName(); |
65 | 65 | } |
66 | 66 | } |
@@ -72,10 +72,10 @@ discard block |
||
72 | 72 | * @param \Illuminate\Http\Request $nativeRequest Laravel request object |
73 | 73 | * @return \Psr\Http\Message\ServerRequestInterface PSR-7 request object |
74 | 74 | */ |
75 | - protected function createRequest( \Illuminate\Http\Request $nativeRequest ) |
|
75 | + protected function createRequest(\Illuminate\Http\Request $nativeRequest) |
|
76 | 76 | { |
77 | - $files = ServerRequestFactory::normalizeFiles( $this->getFiles( $nativeRequest->files->all() ) ); |
|
78 | - $server = ServerRequestFactory::normalizeServer( $nativeRequest->server->all() ); |
|
77 | + $files = ServerRequestFactory::normalizeFiles($this->getFiles($nativeRequest->files->all())); |
|
78 | + $server = ServerRequestFactory::normalizeServer($nativeRequest->server->all()); |
|
79 | 79 | $headers = $nativeRequest->headers->all(); |
80 | 80 | $cookies = $nativeRequest->cookies->all(); |
81 | 81 | $post = $nativeRequest->request->all(); |
@@ -83,13 +83,13 @@ discard block |
||
83 | 83 | $method = $nativeRequest->getMethod(); |
84 | 84 | $uri = $nativeRequest->getUri(); |
85 | 85 | |
86 | - $body = new Stream( 'php://temp', 'wb+' ); |
|
87 | - $body->write( $nativeRequest->getContent() ); |
|
86 | + $body = new Stream('php://temp', 'wb+'); |
|
87 | + $body->write($nativeRequest->getContent()); |
|
88 | 88 | |
89 | - $request = new ServerRequest( $server, $files, $uri, $method, $body, $headers, $cookies, $query, $post ); |
|
89 | + $request = new ServerRequest($server, $files, $uri, $method, $body, $headers, $cookies, $query, $post); |
|
90 | 90 | |
91 | - foreach( $nativeRequest->attributes->all() as $key => $value ) { |
|
92 | - $request = $request->withAttribute( $key, $value ); |
|
91 | + foreach ($nativeRequest->attributes->all() as $key => $value) { |
|
92 | + $request = $request->withAttribute($key, $value); |
|
93 | 93 | } |
94 | 94 | |
95 | 95 | return $request; |
@@ -102,13 +102,13 @@ discard block |
||
102 | 102 | * @param array $files Multi-dimensional list of uploaded files from Symfony request |
103 | 103 | * @return array Multi-dimensional list of uploaded files as PSR-7 objects |
104 | 104 | */ |
105 | - protected function getFiles( array $files ) |
|
105 | + protected function getFiles(array $files) |
|
106 | 106 | { |
107 | 107 | $list = []; |
108 | 108 | |
109 | - foreach( $files as $key => $value ) |
|
109 | + foreach ($files as $key => $value) |
|
110 | 110 | { |
111 | - if( $value instanceof \Symfony\Component\HttpFoundation\File\UploadedFile ) |
|
111 | + if ($value instanceof \Symfony\Component\HttpFoundation\File\UploadedFile) |
|
112 | 112 | { |
113 | 113 | $list[$key] = new \Zend\Diactoros\UploadedFile( |
114 | 114 | $value->getRealPath(), |
@@ -118,9 +118,9 @@ discard block |
||
118 | 118 | $value->getClientMimeType() |
119 | 119 | ); |
120 | 120 | } |
121 | - elseif( is_array( $value ) ) |
|
121 | + elseif (is_array($value)) |
|
122 | 122 | { |
123 | - $list[$key] = $this->getFiles( $value ); |
|
123 | + $list[$key] = $this->getFiles($value); |
|
124 | 124 | } |
125 | 125 | } |
126 | 126 |
@@ -32,9 +32,9 @@ discard block |
||
32 | 32 | * @param \Illuminate\Contracts\Routing\UrlGenerator $builder Laravel URL builder object |
33 | 33 | * @param array Associative list of fixed parameters that should be available for all routes |
34 | 34 | */ |
35 | - public function __construct( \Aimeos\MW\View\Iface $view, \Illuminate\Contracts\Routing\UrlGenerator $builder, array $fixed ) |
|
35 | + public function __construct(\Aimeos\MW\View\Iface $view, \Illuminate\Contracts\Routing\UrlGenerator $builder, array $fixed) |
|
36 | 36 | { |
37 | - parent::__construct( $view ); |
|
37 | + parent::__construct($view); |
|
38 | 38 | |
39 | 39 | $this->builder = $builder; |
40 | 40 | $this->fixed = $fixed; |
@@ -52,12 +52,12 @@ discard block |
||
52 | 52 | * @param array $config Additional configuration parameter per URL |
53 | 53 | * @return string Complete URL that can be used in the template |
54 | 54 | */ |
55 | - public function transform( $target = null, $controller = null, $action = null, array $params = [], array $trailing = [], array $config = [] ) |
|
55 | + public function transform($target = null, $controller = null, $action = null, array $params = [], array $trailing = [], array $config = []) |
|
56 | 56 | { |
57 | - $params = $this->sanitize( $params ); |
|
58 | - $values = $this->getValues( $config ); |
|
57 | + $params = $this->sanitize($params); |
|
58 | + $values = $this->getValues($config); |
|
59 | 59 | |
60 | - return $this->builder->route( $target, $params + $this->fixed, $values['absoluteUri'] ); |
|
60 | + return $this->builder->route($target, $params + $this->fixed, $values['absoluteUri']); |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | |
@@ -67,13 +67,13 @@ discard block |
||
67 | 67 | * @param array $config Associative list of key/value pairs |
68 | 68 | * @return array Associative list of sanitized key/value pairs |
69 | 69 | */ |
70 | - protected function getValues( array $config ) |
|
70 | + protected function getValues(array $config) |
|
71 | 71 | { |
72 | 72 | $values = array( |
73 | 73 | 'absoluteUri' => false, |
74 | 74 | ); |
75 | 75 | |
76 | - if( isset( $config['absoluteUri'] ) ) { |
|
76 | + if (isset($config['absoluteUri'])) { |
|
77 | 77 | $values['absoluteUri'] = (bool) $config['absoluteUri']; |
78 | 78 | } |
79 | 79 |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | 'label' => 'Customer address ID', |
27 | 27 | 'code' => 'customer.address.id', |
28 | 28 | 'internalcode' => 'lvuad."id"', |
29 | - 'internaldeps' => array( 'LEFT JOIN "users_address" AS lvuad ON ( lvu."id" = lvuad."parentid" )' ), |
|
29 | + 'internaldeps' => array('LEFT JOIN "users_address" AS lvuad ON ( lvu."id" = lvuad."parentid" )'), |
|
30 | 30 | 'type' => 'integer', |
31 | 31 | 'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT, |
32 | 32 | 'public' => false, |
@@ -223,11 +223,11 @@ discard block |
||
223 | 223 | * |
224 | 224 | * @param array $siteids List of IDs for sites whose entries should be deleted |
225 | 225 | */ |
226 | - public function cleanup( array $siteids ) |
|
226 | + public function cleanup(array $siteids) |
|
227 | 227 | { |
228 | 228 | $path = 'mshop/customer/manager/address/submanagers'; |
229 | - foreach( $this->getContext()->getConfig()->get( $path, [] ) as $domain ) { |
|
230 | - $this->getSubManager( $domain )->cleanup( $siteids ); |
|
229 | + foreach ($this->getContext()->getConfig()->get($path, []) as $domain) { |
|
230 | + $this->getSubManager($domain)->cleanup($siteids); |
|
231 | 231 | } |
232 | 232 | } |
233 | 233 | |
@@ -237,10 +237,10 @@ discard block |
||
237 | 237 | * |
238 | 238 | * @param array $ids List of IDs |
239 | 239 | */ |
240 | - public function deleteItems( array $ids ) |
|
240 | + public function deleteItems(array $ids) |
|
241 | 241 | { |
242 | 242 | $path = 'mshop/customer/manager/address/laravel/delete'; |
243 | - $this->deleteItemsBase( $ids, $path, false ); |
|
243 | + $this->deleteItemsBase($ids, $path, false); |
|
244 | 244 | } |
245 | 245 | |
246 | 246 | |
@@ -250,11 +250,11 @@ discard block |
||
250 | 250 | * @param boolean $withsub Return also attributes of sub-managers if true |
251 | 251 | * @return array List of attribute items implementing \Aimeos\MW\Criteria\Attribute\Iface |
252 | 252 | */ |
253 | - public function getSearchAttributes( $withsub = true ) |
|
253 | + public function getSearchAttributes($withsub = true) |
|
254 | 254 | { |
255 | 255 | $path = 'mshop/customer/manager/address/submanagers'; |
256 | 256 | |
257 | - return $this->getSearchAttributesBase( $this->searchConfig, $path, [], $withsub ); |
|
257 | + return $this->getSearchAttributesBase($this->searchConfig, $path, [], $withsub); |
|
258 | 258 | } |
259 | 259 | |
260 | 260 | |
@@ -265,9 +265,9 @@ discard block |
||
265 | 265 | * @param string|null $name Name of the implementation, will be from configuration (or Default) if null |
266 | 266 | * @return mixed Manager for different extensions, e.g stock, tags, locations, etc. |
267 | 267 | */ |
268 | - public function getSubManager( $manager, $name = null ) |
|
268 | + public function getSubManager($manager, $name = null) |
|
269 | 269 | { |
270 | - return $this->getSubManagerBase( 'customer', 'address/' . $manager, ( $name === null ? 'Laravel' : $name ) ); |
|
270 | + return $this->getSubManagerBase('customer', 'address/'.$manager, ($name === null ? 'Laravel' : $name)); |
|
271 | 271 | } |
272 | 272 | |
273 | 273 |
@@ -240,11 +240,11 @@ discard block |
||
240 | 240 | * |
241 | 241 | * @param array $siteids List of IDs for sites whose entries should be deleted |
242 | 242 | */ |
243 | - public function cleanup( array $siteids ) |
|
243 | + public function cleanup(array $siteids) |
|
244 | 244 | { |
245 | 245 | $path = 'mshop/customer/manager/submanagers'; |
246 | - foreach( $this->getContext()->getConfig()->get( $path, array( 'address', 'lists' ) ) as $domain ) { |
|
247 | - $this->getSubManager( $domain )->cleanup( $siteids ); |
|
246 | + foreach ($this->getContext()->getConfig()->get($path, array('address', 'lists')) as $domain) { |
|
247 | + $this->getSubManager($domain)->cleanup($siteids); |
|
248 | 248 | } |
249 | 249 | } |
250 | 250 | |
@@ -265,10 +265,10 @@ discard block |
||
265 | 265 | * |
266 | 266 | * @param array $ids List of IDs |
267 | 267 | */ |
268 | - public function deleteItems( array $ids ) |
|
268 | + public function deleteItems(array $ids) |
|
269 | 269 | { |
270 | 270 | $path = 'mshop/customer/manager/laravel/delete'; |
271 | - $this->deleteItemsBase( $ids, $path, false ); |
|
271 | + $this->deleteItemsBase($ids, $path, false); |
|
272 | 272 | } |
273 | 273 | |
274 | 274 | |
@@ -278,11 +278,11 @@ discard block |
||
278 | 278 | * @param boolean $withsub Return also attributes of sub-managers if true |
279 | 279 | * @return array List of attribute items implementing \Aimeos\MW\Criteria\Attribute\Iface |
280 | 280 | */ |
281 | - public function getSearchAttributes( $withsub = true ) |
|
281 | + public function getSearchAttributes($withsub = true) |
|
282 | 282 | { |
283 | 283 | $path = 'mshop/customer/manager/submanagers'; |
284 | 284 | |
285 | - return $this->getSearchAttributesBase( $this->searchConfig, $path, array( 'address', 'lists' ), $withsub ); |
|
285 | + return $this->getSearchAttributesBase($this->searchConfig, $path, array('address', 'lists'), $withsub); |
|
286 | 286 | } |
287 | 287 | |
288 | 288 | |
@@ -292,27 +292,27 @@ discard block |
||
292 | 292 | * @param \Aimeos\MShop\Customer\Item\Iface $item Customer item object |
293 | 293 | * @param boolean $fetch True if the new ID should be returned in the item |
294 | 294 | */ |
295 | - public function saveItem( \Aimeos\MShop\Common\Item\Iface $item, $fetch = true ) |
|
295 | + public function saveItem(\Aimeos\MShop\Common\Item\Iface $item, $fetch = true) |
|
296 | 296 | { |
297 | 297 | $iface = '\\Aimeos\\MShop\\Customer\\Item\\Iface'; |
298 | - if( !( $item instanceof $iface ) ) { |
|
299 | - throw new \Aimeos\MShop\Customer\Exception( sprintf( 'Object is not of required type "%1$s"', $iface ) ); |
|
298 | + if (!($item instanceof $iface)) { |
|
299 | + throw new \Aimeos\MShop\Customer\Exception(sprintf('Object is not of required type "%1$s"', $iface)); |
|
300 | 300 | } |
301 | 301 | |
302 | - if( !$item->isModified() ) { return; } |
|
302 | + if (!$item->isModified()) { return; } |
|
303 | 303 | |
304 | 304 | $context = $this->getContext(); |
305 | 305 | $dbm = $context->getDatabaseManager(); |
306 | 306 | $dbname = $this->getResourceName(); |
307 | - $conn = $dbm->acquire( $dbname ); |
|
307 | + $conn = $dbm->acquire($dbname); |
|
308 | 308 | |
309 | 309 | try |
310 | 310 | { |
311 | 311 | $id = $item->getId(); |
312 | - $date = date( 'Y-m-d H:i:s' ); |
|
312 | + $date = date('Y-m-d H:i:s'); |
|
313 | 313 | $billingAddress = $item->getPaymentAddress(); |
314 | 314 | |
315 | - if( $id === null ) |
|
315 | + if ($id === null) |
|
316 | 316 | { |
317 | 317 | /** mshop/customer/manager/laravel/insert |
318 | 318 | * Inserts a new customer record into the database table |
@@ -376,47 +376,47 @@ discard block |
||
376 | 376 | $path = 'mshop/customer/manager/laravel/update'; |
377 | 377 | } |
378 | 378 | |
379 | - $stmt = $this->getCachedStatement( $conn, $path ); |
|
380 | - |
|
381 | - $stmt->bind( 1, $item->getCode() ); |
|
382 | - $stmt->bind( 2, $billingAddress->getCompany() ); |
|
383 | - $stmt->bind( 3, $billingAddress->getVatID() ); |
|
384 | - $stmt->bind( 4, $billingAddress->getSalutation() ); |
|
385 | - $stmt->bind( 5, $billingAddress->getTitle() ); |
|
386 | - $stmt->bind( 6, $billingAddress->getFirstname() ); |
|
387 | - $stmt->bind( 7, $billingAddress->getLastname() ); |
|
388 | - $stmt->bind( 8, $billingAddress->getAddress1() ); |
|
389 | - $stmt->bind( 9, $billingAddress->getAddress2() ); |
|
390 | - $stmt->bind( 10, $billingAddress->getAddress3() ); |
|
391 | - $stmt->bind( 11, $billingAddress->getPostal() ); |
|
392 | - $stmt->bind( 12, $billingAddress->getCity() ); |
|
393 | - $stmt->bind( 13, $billingAddress->getState() ); |
|
394 | - $stmt->bind( 14, $billingAddress->getCountryId() ); |
|
395 | - $stmt->bind( 15, $billingAddress->getLanguageId() ); |
|
396 | - $stmt->bind( 16, $billingAddress->getTelephone() ); |
|
397 | - $stmt->bind( 17, $billingAddress->getTelefax() ); |
|
398 | - $stmt->bind( 18, $billingAddress->getWebsite() ); |
|
399 | - $stmt->bind( 19, $billingAddress->getEmail() ); |
|
400 | - $stmt->bind( 20, $billingAddress->getLongitude() ); |
|
401 | - $stmt->bind( 21, $billingAddress->getLatitude() ); |
|
402 | - $stmt->bind( 22, $item->getLabel() ); |
|
403 | - $stmt->bind( 23, $item->getBirthday() ); |
|
404 | - $stmt->bind( 24, $item->getStatus(), \Aimeos\MW\DB\Statement\Base::PARAM_INT ); |
|
405 | - $stmt->bind( 25, $item->getDateVerified() ); |
|
406 | - $stmt->bind( 26, $item->getPassword() ); |
|
407 | - $stmt->bind( 27, $date ); // Modification time |
|
408 | - $stmt->bind( 28, $context->getEditor() ); |
|
409 | - |
|
410 | - if( $id !== null ) { |
|
411 | - $stmt->bind( 29, $id, \Aimeos\MW\DB\Statement\Base::PARAM_INT ); |
|
412 | - $item->setId( $id ); |
|
379 | + $stmt = $this->getCachedStatement($conn, $path); |
|
380 | + |
|
381 | + $stmt->bind(1, $item->getCode()); |
|
382 | + $stmt->bind(2, $billingAddress->getCompany()); |
|
383 | + $stmt->bind(3, $billingAddress->getVatID()); |
|
384 | + $stmt->bind(4, $billingAddress->getSalutation()); |
|
385 | + $stmt->bind(5, $billingAddress->getTitle()); |
|
386 | + $stmt->bind(6, $billingAddress->getFirstname()); |
|
387 | + $stmt->bind(7, $billingAddress->getLastname()); |
|
388 | + $stmt->bind(8, $billingAddress->getAddress1()); |
|
389 | + $stmt->bind(9, $billingAddress->getAddress2()); |
|
390 | + $stmt->bind(10, $billingAddress->getAddress3()); |
|
391 | + $stmt->bind(11, $billingAddress->getPostal()); |
|
392 | + $stmt->bind(12, $billingAddress->getCity()); |
|
393 | + $stmt->bind(13, $billingAddress->getState()); |
|
394 | + $stmt->bind(14, $billingAddress->getCountryId()); |
|
395 | + $stmt->bind(15, $billingAddress->getLanguageId()); |
|
396 | + $stmt->bind(16, $billingAddress->getTelephone()); |
|
397 | + $stmt->bind(17, $billingAddress->getTelefax()); |
|
398 | + $stmt->bind(18, $billingAddress->getWebsite()); |
|
399 | + $stmt->bind(19, $billingAddress->getEmail()); |
|
400 | + $stmt->bind(20, $billingAddress->getLongitude()); |
|
401 | + $stmt->bind(21, $billingAddress->getLatitude()); |
|
402 | + $stmt->bind(22, $item->getLabel()); |
|
403 | + $stmt->bind(23, $item->getBirthday()); |
|
404 | + $stmt->bind(24, $item->getStatus(), \Aimeos\MW\DB\Statement\Base::PARAM_INT); |
|
405 | + $stmt->bind(25, $item->getDateVerified()); |
|
406 | + $stmt->bind(26, $item->getPassword()); |
|
407 | + $stmt->bind(27, $date); // Modification time |
|
408 | + $stmt->bind(28, $context->getEditor()); |
|
409 | + |
|
410 | + if ($id !== null) { |
|
411 | + $stmt->bind(29, $id, \Aimeos\MW\DB\Statement\Base::PARAM_INT); |
|
412 | + $item->setId($id); |
|
413 | 413 | } else { |
414 | - $stmt->bind( 29, $date ); // Creation time |
|
414 | + $stmt->bind(29, $date); // Creation time |
|
415 | 415 | } |
416 | 416 | |
417 | 417 | $stmt->execute()->finish(); |
418 | 418 | |
419 | - if( $id === null && $fetch === true ) |
|
419 | + if ($id === null && $fetch === true) |
|
420 | 420 | { |
421 | 421 | /** mshop/customer/manager/laravel/newid |
422 | 422 | * Retrieves the ID generated by the database when inserting a new record |
@@ -449,14 +449,14 @@ discard block |
||
449 | 449 | * @see mshop/customer/manager/laravel/count |
450 | 450 | */ |
451 | 451 | $path = 'mshop/customer/manager/laravel/newid'; |
452 | - $item->setId( $this->newId( $conn, $path ) ); |
|
452 | + $item->setId($this->newId($conn, $path)); |
|
453 | 453 | } |
454 | 454 | |
455 | - $dbm->release( $conn, $dbname ); |
|
455 | + $dbm->release($conn, $dbname); |
|
456 | 456 | } |
457 | - catch( \Exception $e ) |
|
457 | + catch (\Exception $e) |
|
458 | 458 | { |
459 | - $dbm->release( $conn, $dbname ); |
|
459 | + $dbm->release($conn, $dbname); |
|
460 | 460 | throw $e; |
461 | 461 | } |
462 | 462 | } |
@@ -470,11 +470,11 @@ discard block |
||
470 | 470 | * @return array List of items implementing \Aimeos\MShop\Customer\Item\Iface |
471 | 471 | * @throws \Aimeos\MShop\Customer\Exception If creating items failed |
472 | 472 | */ |
473 | - public function searchItems( \Aimeos\MW\Criteria\Iface $search, array $ref = [], &$total = null ) |
|
473 | + public function searchItems(\Aimeos\MW\Criteria\Iface $search, array $ref = [], &$total = null) |
|
474 | 474 | { |
475 | 475 | $dbm = $this->getContext()->getDatabaseManager(); |
476 | 476 | $dbname = $this->getResourceName(); |
477 | - $conn = $dbm->acquire( $dbname ); |
|
477 | + $conn = $dbm->acquire($dbname); |
|
478 | 478 | $map = []; |
479 | 479 | |
480 | 480 | try |
@@ -482,27 +482,27 @@ discard block |
||
482 | 482 | $level = \Aimeos\MShop\Locale\Manager\Base::SITE_ALL; |
483 | 483 | $cfgPathSearch = 'mshop/customer/manager/laravel/search'; |
484 | 484 | $cfgPathCount = 'mshop/customer/manager/laravel/count'; |
485 | - $required = array( 'customer' ); |
|
485 | + $required = array('customer'); |
|
486 | 486 | |
487 | - $results = $this->searchItemsBase( $conn, $search, $cfgPathSearch, $cfgPathCount, $required, $total, $level ); |
|
488 | - while( ( $row = $results->fetch() ) !== false ) { |
|
489 | - $map[ $row['customer.id'] ] = $row; |
|
487 | + $results = $this->searchItemsBase($conn, $search, $cfgPathSearch, $cfgPathCount, $required, $total, $level); |
|
488 | + while (($row = $results->fetch()) !== false) { |
|
489 | + $map[$row['customer.id']] = $row; |
|
490 | 490 | } |
491 | 491 | |
492 | - $dbm->release( $conn, $dbname ); |
|
492 | + $dbm->release($conn, $dbname); |
|
493 | 493 | } |
494 | - catch( \Exception $e ) |
|
494 | + catch (\Exception $e) |
|
495 | 495 | { |
496 | - $dbm->release( $conn, $dbname ); |
|
496 | + $dbm->release($conn, $dbname); |
|
497 | 497 | throw $e; |
498 | 498 | } |
499 | 499 | |
500 | 500 | $addrItems = []; |
501 | - if( in_array( 'address', $ref, true ) ) { |
|
502 | - $addrItems = $this->getAddressItems( array_keys( $map ) ); |
|
501 | + if (in_array('address', $ref, true)) { |
|
502 | + $addrItems = $this->getAddressItems(array_keys($map)); |
|
503 | 503 | } |
504 | 504 | |
505 | - return $this->buildItems( $map, $ref, 'customer', $addrItems ); |
|
505 | + return $this->buildItems($map, $ref, 'customer', $addrItems); |
|
506 | 506 | } |
507 | 507 | |
508 | 508 | |
@@ -513,8 +513,8 @@ discard block |
||
513 | 513 | * @param string|null $name Name of the implementation, will be from configuration (or Default) if null |
514 | 514 | * @return mixed Manager for different extensions, e.g stock, tags, locations, etc. |
515 | 515 | */ |
516 | - public function getSubManager( $manager, $name = null ) |
|
516 | + public function getSubManager($manager, $name = null) |
|
517 | 517 | { |
518 | - return $this->getSubManagerBase( 'customer', $manager, ( $name === null ? 'Laravel' : $name ) ); |
|
518 | + return $this->getSubManagerBase('customer', $manager, ($name === null ? 'Laravel' : $name)); |
|
519 | 519 | } |
520 | 520 | } |