@@ -47,6 +47,9 @@ |
||
47 | 47 | } |
48 | 48 | |
49 | 49 | |
50 | + /** |
|
51 | + * @param string $site |
|
52 | + */ |
|
50 | 53 | private static function createContext( $site ) |
51 | 54 | { |
52 | 55 | $ctx = new \Aimeos\MShop\Context\Item\Standard(); |
@@ -18,14 +18,14 @@ discard block |
||
18 | 18 | |
19 | 19 | $includepaths = $aimeos->getIncludePaths(); |
20 | 20 | $includepaths[] = get_include_path(); |
21 | - set_include_path( implode( PATH_SEPARATOR, $includepaths ) ); |
|
21 | + set_include_path(implode(PATH_SEPARATOR, $includepaths)); |
|
22 | 22 | } |
23 | 23 | |
24 | 24 | |
25 | - public static function getContext( $site = 'unittest' ) |
|
25 | + public static function getContext($site = 'unittest') |
|
26 | 26 | { |
27 | - if( !isset( self::$context[$site] ) ) { |
|
28 | - self::$context[$site] = self::createContext( $site ); |
|
27 | + if (!isset(self::$context[$site])) { |
|
28 | + self::$context[$site] = self::createContext($site); |
|
29 | 29 | } |
30 | 30 | |
31 | 31 | return clone self::$context[$site]; |
@@ -34,54 +34,54 @@ discard block |
||
34 | 34 | |
35 | 35 | private static function getAimeos() |
36 | 36 | { |
37 | - if( !isset( self::$aimeos ) ) |
|
37 | + if (!isset(self::$aimeos)) |
|
38 | 38 | { |
39 | 39 | require_once 'Bootstrap.php'; |
40 | - spl_autoload_register( 'Aimeos\\Bootstrap::autoload' ); |
|
40 | + spl_autoload_register('Aimeos\\Bootstrap::autoload'); |
|
41 | 41 | |
42 | - $extdir = dirname( dirname( dirname( __DIR__ ) ) ); |
|
43 | - self::$aimeos = new \Aimeos\Bootstrap( array( $extdir ), false ); |
|
42 | + $extdir = dirname(dirname(dirname(__DIR__))); |
|
43 | + self::$aimeos = new \Aimeos\Bootstrap(array($extdir), false); |
|
44 | 44 | } |
45 | 45 | |
46 | 46 | return self::$aimeos; |
47 | 47 | } |
48 | 48 | |
49 | 49 | |
50 | - private static function createContext( $site ) |
|
50 | + private static function createContext($site) |
|
51 | 51 | { |
52 | 52 | $ctx = new \Aimeos\MShop\Context\Item\Standard(); |
53 | 53 | $aimeos = self::getAimeos(); |
54 | 54 | |
55 | 55 | |
56 | - $paths = $aimeos->getConfigPaths( 'mysql' ); |
|
57 | - $paths[] = __DIR__ . DIRECTORY_SEPARATOR . 'config'; |
|
56 | + $paths = $aimeos->getConfigPaths('mysql'); |
|
57 | + $paths[] = __DIR__.DIRECTORY_SEPARATOR.'config'; |
|
58 | 58 | |
59 | - $conf = new \Aimeos\MW\Config\PHPArray( [], $paths ); |
|
60 | - $ctx->setConfig( $conf ); |
|
59 | + $conf = new \Aimeos\MW\Config\PHPArray([], $paths); |
|
60 | + $ctx->setConfig($conf); |
|
61 | 61 | |
62 | 62 | |
63 | - $dbm = new \Aimeos\MW\DB\Manager\PDO( $conf ); |
|
64 | - $ctx->setDatabaseManager( $dbm ); |
|
63 | + $dbm = new \Aimeos\MW\DB\Manager\PDO($conf); |
|
64 | + $ctx->setDatabaseManager($dbm); |
|
65 | 65 | |
66 | 66 | |
67 | - $logger = new \Aimeos\MW\Logger\File( $site . '.log', \Aimeos\MW\Logger\Base::DEBUG ); |
|
68 | - $ctx->setLogger( $logger ); |
|
67 | + $logger = new \Aimeos\MW\Logger\File($site.'.log', \Aimeos\MW\Logger\Base::DEBUG); |
|
68 | + $ctx->setLogger($logger); |
|
69 | 69 | |
70 | 70 | |
71 | - $i18n = new \Aimeos\MW\Translation\None( 'de' ); |
|
72 | - $ctx->setI18n( array( 'de' => $i18n ) ); |
|
71 | + $i18n = new \Aimeos\MW\Translation\None('de'); |
|
72 | + $ctx->setI18n(array('de' => $i18n)); |
|
73 | 73 | |
74 | 74 | |
75 | 75 | $session = new \Aimeos\MW\Session\None(); |
76 | - $ctx->setSession( $session ); |
|
76 | + $ctx->setSession($session); |
|
77 | 77 | |
78 | 78 | |
79 | - $localeManager = \Aimeos\MShop\Locale\Manager\Factory::create( $ctx ); |
|
80 | - $localeItem = $localeManager->bootstrap( $site, '', '', false ); |
|
79 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::create($ctx); |
|
80 | + $localeItem = $localeManager->bootstrap($site, '', '', false); |
|
81 | 81 | |
82 | - $ctx->setLocale( $localeItem ); |
|
82 | + $ctx->setLocale($localeItem); |
|
83 | 83 | |
84 | - $ctx->setEditor( 'ai-laravel:unittest' ); |
|
84 | + $ctx->setEditor('ai-laravel:unittest'); |
|
85 | 85 | |
86 | 86 | return $ctx; |
87 | 87 | } |
@@ -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 | |
@@ -30,34 +30,34 @@ discard block |
||
30 | 30 | */ |
31 | 31 | public function migrate() |
32 | 32 | { |
33 | - \Aimeos\MW\Common\Base::checkClass( '\\Aimeos\\MShop\\Context\\Item\\Iface', $this->additional ); |
|
33 | + \Aimeos\MW\Common\Base::checkClass('\\Aimeos\\MShop\\Context\\Item\\Iface', $this->additional); |
|
34 | 34 | |
35 | - $this->msg( 'Adding Laravel customer test data', 0 ); |
|
36 | - $this->additional->setEditor( 'ai-laravel:unittest' ); |
|
35 | + $this->msg('Adding Laravel customer test data', 0); |
|
36 | + $this->additional->setEditor('ai-laravel:unittest'); |
|
37 | 37 | |
38 | 38 | $parentIds = []; |
39 | 39 | $ds = DIRECTORY_SEPARATOR; |
40 | - $path = __DIR__ . $ds . 'data' . $ds . 'customer.php'; |
|
40 | + $path = __DIR__.$ds.'data'.$ds.'customer.php'; |
|
41 | 41 | |
42 | - if( ( $testdata = include( $path ) ) == false ){ |
|
43 | - throw new \Aimeos\MShop\Exception( sprintf( 'No file "%1$s" found for customer domain', $path ) ); |
|
42 | + if (($testdata = include($path)) == false) { |
|
43 | + throw new \Aimeos\MShop\Exception(sprintf('No file "%1$s" found for customer domain', $path)); |
|
44 | 44 | } |
45 | 45 | |
46 | 46 | |
47 | - $customerManager = \Aimeos\MShop\Customer\Manager\Factory::create( $this->additional, 'Laravel' ); |
|
48 | - $customerAddressManager = $customerManager->getSubManager( 'address', 'Laravel' ); |
|
47 | + $customerManager = \Aimeos\MShop\Customer\Manager\Factory::create($this->additional, 'Laravel'); |
|
48 | + $customerAddressManager = $customerManager->getSubManager('address', 'Laravel'); |
|
49 | 49 | |
50 | - $this->cleanupCustomerData( $customerManager, $customerAddressManager ); |
|
50 | + $this->cleanupCustomerData($customerManager, $customerAddressManager); |
|
51 | 51 | |
52 | 52 | $this->conn->begin(); |
53 | 53 | |
54 | - $parentIds = $this->addCustomerData( $testdata, $customerManager, $customerAddressManager->createItem() ); |
|
55 | - $this->addCustomerAddressData( $testdata, $customerAddressManager, $parentIds ); |
|
54 | + $parentIds = $this->addCustomerData($testdata, $customerManager, $customerAddressManager->createItem()); |
|
55 | + $this->addCustomerAddressData($testdata, $customerAddressManager, $parentIds); |
|
56 | 56 | |
57 | 57 | $this->conn->commit(); |
58 | 58 | |
59 | 59 | |
60 | - $this->status( 'done' ); |
|
60 | + $this->status('done'); |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | |
@@ -67,17 +67,17 @@ discard block |
||
67 | 67 | * @param \Aimeos\MShop\Common\Manager\Iface $customerManager Customer manager |
68 | 68 | * @param \Aimeos\MShop\Common\Manager\Iface $customerAddressManager Customer address manager |
69 | 69 | */ |
70 | - protected function cleanupCustomerData( \Aimeos\MShop\Common\Manager\Iface $customerManager, \Aimeos\MShop\Common\Manager\Iface $customerAddressManager ) |
|
70 | + protected function cleanupCustomerData(\Aimeos\MShop\Common\Manager\Iface $customerManager, \Aimeos\MShop\Common\Manager\Iface $customerAddressManager) |
|
71 | 71 | { |
72 | 72 | $search = $customerManager->createSearch(); |
73 | - $search->setConditions( $search->compare( '=~', 'customer.code', 'UTC00' ) ); |
|
74 | - $customerItems = $customerManager->searchItems( $search ); |
|
73 | + $search->setConditions($search->compare('=~', 'customer.code', 'UTC00')); |
|
74 | + $customerItems = $customerManager->searchItems($search); |
|
75 | 75 | |
76 | 76 | $search = $customerAddressManager->createSearch(); |
77 | - $search->setConditions( $search->compare( '=~', 'customer.address.email', 'unitCustomer' ) ); |
|
78 | - $addressItems = $customerAddressManager->searchItems( $search ); |
|
77 | + $search->setConditions($search->compare('=~', 'customer.address.email', 'unitCustomer')); |
|
78 | + $addressItems = $customerAddressManager->searchItems($search); |
|
79 | 79 | |
80 | - $customerAddressManager->deleteItems( array_keys( $addressItems ) ); |
|
81 | - $customerManager->deleteItems( array_keys( $customerItems ) ); |
|
80 | + $customerAddressManager->deleteItems(array_keys($addressItems)); |
|
81 | + $customerManager->deleteItems(array_keys($customerItems)); |
|
82 | 82 | } |
83 | 83 | } |
@@ -18,43 +18,43 @@ discard block |
||
18 | 18 | { |
19 | 19 | $this->context = \TestHelper::getContext(); |
20 | 20 | $this->editor = $this->context->getEditor(); |
21 | - $manager = \Aimeos\MShop\Customer\Manager\Factory::create( $this->context, 'Laravel' ); |
|
22 | - $this->object = $manager->getSubManager( 'lists', 'Laravel' ); |
|
21 | + $manager = \Aimeos\MShop\Customer\Manager\Factory::create($this->context, 'Laravel'); |
|
22 | + $this->object = $manager->getSubManager('lists', 'Laravel'); |
|
23 | 23 | } |
24 | 24 | |
25 | 25 | |
26 | 26 | protected function tearDown() |
27 | 27 | { |
28 | - unset( $this->object, $this->context ); |
|
28 | + unset($this->object, $this->context); |
|
29 | 29 | } |
30 | 30 | |
31 | 31 | |
32 | 32 | public function testCleanup() |
33 | 33 | { |
34 | - $this->object->cleanup( array( -1 ) ); |
|
34 | + $this->object->cleanup(array( -1 )); |
|
35 | 35 | } |
36 | 36 | |
37 | 37 | |
38 | 38 | public function testAggregate() |
39 | 39 | { |
40 | - $search = $this->object->createSearch( true ); |
|
40 | + $search = $this->object->createSearch(true); |
|
41 | 41 | $expr = array( |
42 | 42 | $search->getConditions(), |
43 | - $search->compare( '==', 'customer.lists.editor', 'ai-laravel:unittest' ), |
|
43 | + $search->compare('==', 'customer.lists.editor', 'ai-laravel:unittest'), |
|
44 | 44 | ); |
45 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
45 | + $search->setConditions($search->combine('&&', $expr)); |
|
46 | 46 | |
47 | - $result = $this->object->aggregate( $search, 'customer.lists.domain' ); |
|
47 | + $result = $this->object->aggregate($search, 'customer.lists.domain'); |
|
48 | 48 | |
49 | - $this->assertEquals( 1, count( $result ) ); |
|
50 | - $this->assertArrayHasKey( 'text', $result ); |
|
51 | - $this->assertEquals( 4, $result['text'] ); |
|
49 | + $this->assertEquals(1, count($result)); |
|
50 | + $this->assertArrayHasKey('text', $result); |
|
51 | + $this->assertEquals(4, $result['text']); |
|
52 | 52 | } |
53 | 53 | |
54 | 54 | |
55 | 55 | public function testCreateItem() |
56 | 56 | { |
57 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $this->object->createItem() ); |
|
57 | + $this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $this->object->createItem()); |
|
58 | 58 | } |
59 | 59 | |
60 | 60 | |
@@ -62,13 +62,13 @@ discard block |
||
62 | 62 | { |
63 | 63 | $search = $this->object->createSearch(); |
64 | 64 | $search->setSlice(0, 1); |
65 | - $results = $this->object->searchItems( $search ); |
|
65 | + $results = $this->object->searchItems($search); |
|
66 | 66 | |
67 | - if( ( $item = reset( $results ) ) === false ) { |
|
68 | - throw new \RuntimeException( 'No item found' ); |
|
67 | + if (($item = reset($results)) === false) { |
|
68 | + throw new \RuntimeException('No item found'); |
|
69 | 69 | } |
70 | 70 | |
71 | - $this->assertEquals( $item, $this->object->getItem( $item->getId() ) ); |
|
71 | + $this->assertEquals($item, $this->object->getItem($item->getId())); |
|
72 | 72 | } |
73 | 73 | |
74 | 74 | |
@@ -76,145 +76,145 @@ discard block |
||
76 | 76 | { |
77 | 77 | $search = $this->object->createSearch(); |
78 | 78 | $search->setSlice(0, 1); |
79 | - $items = $this->object->searchItems( $search ); |
|
79 | + $items = $this->object->searchItems($search); |
|
80 | 80 | |
81 | - if( ( $item = reset( $items ) ) === false ) { |
|
82 | - throw new \RuntimeException( 'No item found' ); |
|
81 | + if (($item = reset($items)) === false) { |
|
82 | + throw new \RuntimeException('No item found'); |
|
83 | 83 | } |
84 | 84 | |
85 | - $item->setId( null ); |
|
86 | - $item->setDomain( 'unittest' ); |
|
87 | - $resultSaved = $this->object->saveItem( $item ); |
|
88 | - $itemSaved = $this->object->getItem( $item->getId() ); |
|
85 | + $item->setId(null); |
|
86 | + $item->setDomain('unittest'); |
|
87 | + $resultSaved = $this->object->saveItem($item); |
|
88 | + $itemSaved = $this->object->getItem($item->getId()); |
|
89 | 89 | |
90 | 90 | $itemExp = clone $itemSaved; |
91 | - $itemExp->setDomain( 'unittest2' ); |
|
92 | - $resultUpd = $this->object->saveItem( $itemExp ); |
|
93 | - $itemUpd = $this->object->getItem( $itemExp->getId() ); |
|
94 | - |
|
95 | - $this->object->deleteItem( $itemSaved->getId() ); |
|
96 | - |
|
97 | - |
|
98 | - $this->assertTrue( $item->getId() !== null ); |
|
99 | - $this->assertEquals( $item->getId(), $itemSaved->getId() ); |
|
100 | - $this->assertEquals( $item->getSiteId(), $itemSaved->getSiteId() ); |
|
101 | - $this->assertEquals( $item->getParentId(), $itemSaved->getParentId() ); |
|
102 | - $this->assertEquals( $item->getType(), $itemSaved->getType() ); |
|
103 | - $this->assertEquals( $item->getRefId(), $itemSaved->getRefId() ); |
|
104 | - $this->assertEquals( $item->getDomain(), $itemSaved->getDomain() ); |
|
105 | - $this->assertEquals( $item->getDateStart(), $itemSaved->getDateStart() ); |
|
106 | - $this->assertEquals( $item->getDateEnd(), $itemSaved->getDateEnd() ); |
|
107 | - $this->assertEquals( $item->getPosition(), $itemSaved->getPosition() ); |
|
108 | - $this->assertEquals( $this->editor, $itemSaved->getEditor() ); |
|
91 | + $itemExp->setDomain('unittest2'); |
|
92 | + $resultUpd = $this->object->saveItem($itemExp); |
|
93 | + $itemUpd = $this->object->getItem($itemExp->getId()); |
|
94 | + |
|
95 | + $this->object->deleteItem($itemSaved->getId()); |
|
96 | + |
|
97 | + |
|
98 | + $this->assertTrue($item->getId() !== null); |
|
99 | + $this->assertEquals($item->getId(), $itemSaved->getId()); |
|
100 | + $this->assertEquals($item->getSiteId(), $itemSaved->getSiteId()); |
|
101 | + $this->assertEquals($item->getParentId(), $itemSaved->getParentId()); |
|
102 | + $this->assertEquals($item->getType(), $itemSaved->getType()); |
|
103 | + $this->assertEquals($item->getRefId(), $itemSaved->getRefId()); |
|
104 | + $this->assertEquals($item->getDomain(), $itemSaved->getDomain()); |
|
105 | + $this->assertEquals($item->getDateStart(), $itemSaved->getDateStart()); |
|
106 | + $this->assertEquals($item->getDateEnd(), $itemSaved->getDateEnd()); |
|
107 | + $this->assertEquals($item->getPosition(), $itemSaved->getPosition()); |
|
108 | + $this->assertEquals($this->editor, $itemSaved->getEditor()); |
|
109 | 109 | $this->assertStringStartsWith(date('Y-m-d', time()), $itemSaved->getTimeCreated()); |
110 | 110 | $this->assertStringStartsWith(date('Y-m-d', time()), $itemSaved->getTimeModified()); |
111 | 111 | |
112 | - $this->assertEquals( $this->editor, $itemSaved->getEditor() ); |
|
113 | - $this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated() ); |
|
114 | - $this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified() ); |
|
112 | + $this->assertEquals($this->editor, $itemSaved->getEditor()); |
|
113 | + $this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated()); |
|
114 | + $this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified()); |
|
115 | 115 | |
116 | - $this->assertEquals( $itemExp->getId(), $itemUpd->getId() ); |
|
117 | - $this->assertEquals( $itemExp->getSiteId(), $itemUpd->getSiteId() ); |
|
118 | - $this->assertEquals( $itemExp->getParentId(), $itemUpd->getParentId() ); |
|
119 | - $this->assertEquals( $itemExp->getType(), $itemUpd->getType() ); |
|
120 | - $this->assertEquals( $itemExp->getRefId(), $itemUpd->getRefId() ); |
|
121 | - $this->assertEquals( $itemExp->getDomain(), $itemUpd->getDomain() ); |
|
122 | - $this->assertEquals( $itemExp->getDateStart(), $itemUpd->getDateStart() ); |
|
123 | - $this->assertEquals( $itemExp->getDateEnd(), $itemUpd->getDateEnd() ); |
|
124 | - $this->assertEquals( $itemExp->getPosition(), $itemUpd->getPosition() ); |
|
116 | + $this->assertEquals($itemExp->getId(), $itemUpd->getId()); |
|
117 | + $this->assertEquals($itemExp->getSiteId(), $itemUpd->getSiteId()); |
|
118 | + $this->assertEquals($itemExp->getParentId(), $itemUpd->getParentId()); |
|
119 | + $this->assertEquals($itemExp->getType(), $itemUpd->getType()); |
|
120 | + $this->assertEquals($itemExp->getRefId(), $itemUpd->getRefId()); |
|
121 | + $this->assertEquals($itemExp->getDomain(), $itemUpd->getDomain()); |
|
122 | + $this->assertEquals($itemExp->getDateStart(), $itemUpd->getDateStart()); |
|
123 | + $this->assertEquals($itemExp->getDateEnd(), $itemUpd->getDateEnd()); |
|
124 | + $this->assertEquals($itemExp->getPosition(), $itemUpd->getPosition()); |
|
125 | 125 | |
126 | - $this->assertEquals( $this->editor, $itemUpd->getEditor() ); |
|
127 | - $this->assertEquals( $itemExp->getTimeCreated(), $itemUpd->getTimeCreated() ); |
|
128 | - $this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified() ); |
|
126 | + $this->assertEquals($this->editor, $itemUpd->getEditor()); |
|
127 | + $this->assertEquals($itemExp->getTimeCreated(), $itemUpd->getTimeCreated()); |
|
128 | + $this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified()); |
|
129 | 129 | |
130 | - $this->assertInstanceOf( \Aimeos\MShop\Common\Item\Iface::class, $resultSaved ); |
|
131 | - $this->assertInstanceOf( \Aimeos\MShop\Common\Item\Iface::class, $resultUpd ); |
|
130 | + $this->assertInstanceOf(\Aimeos\MShop\Common\Item\Iface::class, $resultSaved); |
|
131 | + $this->assertInstanceOf(\Aimeos\MShop\Common\Item\Iface::class, $resultUpd); |
|
132 | 132 | |
133 | 133 | $this->setExpectedException('\\Aimeos\\MShop\\Exception'); |
134 | - $this->object->getItem( $itemSaved->getId() ); |
|
134 | + $this->object->getItem($itemSaved->getId()); |
|
135 | 135 | } |
136 | 136 | |
137 | 137 | |
138 | 138 | public function testMoveItemLastToFront() |
139 | 139 | { |
140 | 140 | $listItems = $this->getListItems(); |
141 | - $this->assertGreaterThan( 1, count( $listItems ) ); |
|
141 | + $this->assertGreaterThan(1, count($listItems)); |
|
142 | 142 | |
143 | - if( ( $first = reset( $listItems ) ) === false ) { |
|
144 | - throw new \RuntimeException( 'No first customer list item' ); |
|
143 | + if (($first = reset($listItems)) === false) { |
|
144 | + throw new \RuntimeException('No first customer list item'); |
|
145 | 145 | } |
146 | 146 | |
147 | - if( ( $last = end( $listItems ) ) === false ) { |
|
148 | - throw new \RuntimeException( 'No last customer list item' ); |
|
147 | + if (($last = end($listItems)) === false) { |
|
148 | + throw new \RuntimeException('No last customer list item'); |
|
149 | 149 | } |
150 | 150 | |
151 | - $this->object->moveItem( $last->getId(), $first->getId() ); |
|
151 | + $this->object->moveItem($last->getId(), $first->getId()); |
|
152 | 152 | |
153 | - $newFirst = $this->object->getItem( $last->getId() ); |
|
154 | - $newSecond = $this->object->getItem( $first->getId() ); |
|
153 | + $newFirst = $this->object->getItem($last->getId()); |
|
154 | + $newSecond = $this->object->getItem($first->getId()); |
|
155 | 155 | |
156 | - $this->object->moveItem( $last->getId() ); |
|
156 | + $this->object->moveItem($last->getId()); |
|
157 | 157 | |
158 | - $this->assertEquals( 1, $newFirst->getPosition() ); |
|
159 | - $this->assertEquals( 2, $newSecond->getPosition() ); |
|
158 | + $this->assertEquals(1, $newFirst->getPosition()); |
|
159 | + $this->assertEquals(2, $newSecond->getPosition()); |
|
160 | 160 | } |
161 | 161 | |
162 | 162 | |
163 | 163 | public function testMoveItemFirstToLast() |
164 | 164 | { |
165 | 165 | $listItems = $this->getListItems(); |
166 | - $this->assertGreaterThan( 1, count( $listItems ) ); |
|
166 | + $this->assertGreaterThan(1, count($listItems)); |
|
167 | 167 | |
168 | - if( ( $first = reset( $listItems ) ) === false ) { |
|
169 | - throw new \RuntimeException( 'No first customer list item' ); |
|
168 | + if (($first = reset($listItems)) === false) { |
|
169 | + throw new \RuntimeException('No first customer list item'); |
|
170 | 170 | } |
171 | 171 | |
172 | - if( ( $second = next( $listItems ) ) === false ) { |
|
173 | - throw new \RuntimeException( 'No second customer list item' ); |
|
172 | + if (($second = next($listItems)) === false) { |
|
173 | + throw new \RuntimeException('No second customer list item'); |
|
174 | 174 | } |
175 | 175 | |
176 | - if( ( $last = end( $listItems ) ) === false ) { |
|
177 | - throw new \RuntimeException( 'No last customer list item' ); |
|
176 | + if (($last = end($listItems)) === false) { |
|
177 | + throw new \RuntimeException('No last customer list item'); |
|
178 | 178 | } |
179 | 179 | |
180 | - $this->object->moveItem( $first->getId() ); |
|
180 | + $this->object->moveItem($first->getId()); |
|
181 | 181 | |
182 | - $newBefore = $this->object->getItem( $last->getId() ); |
|
183 | - $newLast = $this->object->getItem( $first->getId() ); |
|
182 | + $newBefore = $this->object->getItem($last->getId()); |
|
183 | + $newLast = $this->object->getItem($first->getId()); |
|
184 | 184 | |
185 | - $this->object->moveItem( $first->getId(), $second->getId() ); |
|
185 | + $this->object->moveItem($first->getId(), $second->getId()); |
|
186 | 186 | |
187 | - $this->assertEquals( $last->getPosition() - 1, $newBefore->getPosition() ); |
|
188 | - $this->assertEquals( $last->getPosition(), $newLast->getPosition() ); |
|
187 | + $this->assertEquals($last->getPosition() - 1, $newBefore->getPosition()); |
|
188 | + $this->assertEquals($last->getPosition(), $newLast->getPosition()); |
|
189 | 189 | } |
190 | 190 | |
191 | 191 | |
192 | 192 | public function testMoveItemFirstUp() |
193 | 193 | { |
194 | 194 | $listItems = $this->getListItems(); |
195 | - $this->assertGreaterThan( 1, count( $listItems ) ); |
|
195 | + $this->assertGreaterThan(1, count($listItems)); |
|
196 | 196 | |
197 | - if( ( $first = reset( $listItems ) ) === false ) { |
|
198 | - throw new \RuntimeException( 'No first customer list item' ); |
|
197 | + if (($first = reset($listItems)) === false) { |
|
198 | + throw new \RuntimeException('No first customer list item'); |
|
199 | 199 | } |
200 | 200 | |
201 | - if( ( $second = next( $listItems ) ) === false ) { |
|
202 | - throw new \RuntimeException( 'No second customer list item' ); |
|
201 | + if (($second = next($listItems)) === false) { |
|
202 | + throw new \RuntimeException('No second customer list item'); |
|
203 | 203 | } |
204 | 204 | |
205 | - if( ( $last = end( $listItems ) ) === false ) { |
|
206 | - throw new \RuntimeException( 'No last customer list item' ); |
|
205 | + if (($last = end($listItems)) === false) { |
|
206 | + throw new \RuntimeException('No last customer list item'); |
|
207 | 207 | } |
208 | 208 | |
209 | - $this->object->moveItem( $first->getId(), $last->getId() ); |
|
209 | + $this->object->moveItem($first->getId(), $last->getId()); |
|
210 | 210 | |
211 | - $newLast = $this->object->getItem( $last->getId() ); |
|
212 | - $newUp = $this->object->getItem( $first->getId() ); |
|
211 | + $newLast = $this->object->getItem($last->getId()); |
|
212 | + $newUp = $this->object->getItem($first->getId()); |
|
213 | 213 | |
214 | - $this->object->moveItem( $first->getId(), $second->getId() ); |
|
214 | + $this->object->moveItem($first->getId(), $second->getId()); |
|
215 | 215 | |
216 | - $this->assertEquals( $last->getPosition() - 1, $newUp->getPosition() ); |
|
217 | - $this->assertEquals( $last->getPosition(), $newLast->getPosition() ); |
|
216 | + $this->assertEquals($last->getPosition() - 1, $newUp->getPosition()); |
|
217 | + $this->assertEquals($last->getPosition(), $newLast->getPosition()); |
|
218 | 218 | } |
219 | 219 | |
220 | 220 | |
@@ -224,29 +224,29 @@ discard block |
||
224 | 224 | $search = $this->object->createSearch(); |
225 | 225 | |
226 | 226 | $expr = []; |
227 | - $expr[] = $search->compare( '!=', 'customer.lists.id', null ); |
|
228 | - $expr[] = $search->compare( '!=', 'customer.lists.siteid', null ); |
|
229 | - $expr[] = $search->compare( '>', 'customer.lists.parentid', 0 ); |
|
230 | - $expr[] = $search->compare( '==', 'customer.lists.domain', 'text' ); |
|
231 | - $expr[] = $search->compare( '==', 'customer.lists.type', 'default' ); |
|
232 | - $expr[] = $search->compare( '>', 'customer.lists.refid', '' ); |
|
233 | - $expr[] = $search->compare( '==', 'customer.lists.datestart', '2010-01-01 00:00:00' ); |
|
234 | - $expr[] = $search->compare( '==', 'customer.lists.dateend', '2100-01-01 00:00:00' ); |
|
235 | - $expr[] = $search->compare( '!=', 'customer.lists.config', null ); |
|
236 | - $expr[] = $search->compare( '>', 'customer.lists.position', 1 ); |
|
237 | - $expr[] = $search->compare( '==', 'customer.lists.status', 1 ); |
|
238 | - $expr[] = $search->compare( '>=', 'customer.lists.mtime', '1970-01-01 00:00:00' ); |
|
239 | - $expr[] = $search->compare( '>=', 'customer.lists.ctime', '1970-01-01 00:00:00' ); |
|
240 | - $expr[] = $search->compare( '==', 'customer.lists.editor', $this->editor ); |
|
241 | - |
|
242 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
227 | + $expr[] = $search->compare('!=', 'customer.lists.id', null); |
|
228 | + $expr[] = $search->compare('!=', 'customer.lists.siteid', null); |
|
229 | + $expr[] = $search->compare('>', 'customer.lists.parentid', 0); |
|
230 | + $expr[] = $search->compare('==', 'customer.lists.domain', 'text'); |
|
231 | + $expr[] = $search->compare('==', 'customer.lists.type', 'default'); |
|
232 | + $expr[] = $search->compare('>', 'customer.lists.refid', ''); |
|
233 | + $expr[] = $search->compare('==', 'customer.lists.datestart', '2010-01-01 00:00:00'); |
|
234 | + $expr[] = $search->compare('==', 'customer.lists.dateend', '2100-01-01 00:00:00'); |
|
235 | + $expr[] = $search->compare('!=', 'customer.lists.config', null); |
|
236 | + $expr[] = $search->compare('>', 'customer.lists.position', 1); |
|
237 | + $expr[] = $search->compare('==', 'customer.lists.status', 1); |
|
238 | + $expr[] = $search->compare('>=', 'customer.lists.mtime', '1970-01-01 00:00:00'); |
|
239 | + $expr[] = $search->compare('>=', 'customer.lists.ctime', '1970-01-01 00:00:00'); |
|
240 | + $expr[] = $search->compare('==', 'customer.lists.editor', $this->editor); |
|
241 | + |
|
242 | + $search->setConditions($search->combine('&&', $expr)); |
|
243 | 243 | $search->setSlice(0, 1); |
244 | - $results = $this->object->searchItems( $search, [], $total ); |
|
245 | - $this->assertEquals( 1, count( $results ) ); |
|
246 | - $this->assertEquals( 2, $total ); |
|
244 | + $results = $this->object->searchItems($search, [], $total); |
|
245 | + $this->assertEquals(1, count($results)); |
|
246 | + $this->assertEquals(2, $total); |
|
247 | 247 | |
248 | - foreach($results as $itemId => $item) { |
|
249 | - $this->assertEquals( $itemId, $item->getId() ); |
|
248 | + foreach ($results as $itemId => $item) { |
|
249 | + $this->assertEquals($itemId, $item->getId()); |
|
250 | 250 | } |
251 | 251 | } |
252 | 252 | |
@@ -254,8 +254,8 @@ discard block |
||
254 | 254 | public function testSearchItemsNoCriteria() |
255 | 255 | { |
256 | 256 | $search = $this->object->createSearch(); |
257 | - $search->setConditions( $search->compare( '==', 'customer.lists.editor', $this->editor ) ); |
|
258 | - $this->assertEquals( 4, count( $this->object->searchItems($search) ) ); |
|
257 | + $search->setConditions($search->compare('==', 'customer.lists.editor', $this->editor)); |
|
258 | + $this->assertEquals(4, count($this->object->searchItems($search))); |
|
259 | 259 | } |
260 | 260 | |
261 | 261 | |
@@ -263,48 +263,48 @@ discard block |
||
263 | 263 | { |
264 | 264 | $search = $this->object->createSearch(true); |
265 | 265 | $conditions = array( |
266 | - $search->compare( '==', 'customer.lists.editor', $this->editor ), |
|
266 | + $search->compare('==', 'customer.lists.editor', $this->editor), |
|
267 | 267 | $search->getConditions() |
268 | 268 | ); |
269 | - $search->setConditions( $search->combine( '&&', $conditions ) ); |
|
270 | - $this->assertEquals( 4, count( $this->object->searchItems($search) ) ); |
|
269 | + $search->setConditions($search->combine('&&', $conditions)); |
|
270 | + $this->assertEquals(4, count($this->object->searchItems($search))); |
|
271 | 271 | } |
272 | 272 | |
273 | 273 | |
274 | 274 | public function testGetSubManager() |
275 | 275 | { |
276 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('type') ); |
|
277 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('type', 'Standard') ); |
|
276 | + $this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('type')); |
|
277 | + $this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('type', 'Standard')); |
|
278 | 278 | |
279 | - $this->setExpectedException( '\\Aimeos\\MShop\\Exception' ); |
|
280 | - $this->object->getSubManager( 'unknown' ); |
|
279 | + $this->setExpectedException('\\Aimeos\\MShop\\Exception'); |
|
280 | + $this->object->getSubManager('unknown'); |
|
281 | 281 | } |
282 | 282 | |
283 | 283 | |
284 | 284 | protected function getListItems() |
285 | 285 | { |
286 | - $manager = \Aimeos\MShop\Customer\Manager\Factory::create( $this->context, 'Laravel' ); |
|
286 | + $manager = \Aimeos\MShop\Customer\Manager\Factory::create($this->context, 'Laravel'); |
|
287 | 287 | |
288 | 288 | $search = $manager->createSearch(); |
289 | - $search->setConditions( $search->compare( '==', 'customer.code', 'UTC003' ) ); |
|
290 | - $search->setSlice( 0, 1 ); |
|
289 | + $search->setConditions($search->compare('==', 'customer.code', 'UTC003')); |
|
290 | + $search->setSlice(0, 1); |
|
291 | 291 | |
292 | - $results = $manager->searchItems( $search ); |
|
292 | + $results = $manager->searchItems($search); |
|
293 | 293 | |
294 | - if( ( $item = reset( $results ) ) === false ) { |
|
295 | - throw new \RuntimeException( 'No customer item found' ); |
|
294 | + if (($item = reset($results)) === false) { |
|
295 | + throw new \RuntimeException('No customer item found'); |
|
296 | 296 | } |
297 | 297 | |
298 | 298 | $search = $this->object->createSearch(); |
299 | 299 | $expr = array( |
300 | - $search->compare( '==', 'customer.lists.parentid', $item->getId() ), |
|
301 | - $search->compare( '==', 'customer.lists.domain', 'text' ), |
|
302 | - $search->compare( '==', 'customer.lists.editor', $this->editor ), |
|
303 | - $search->compare( '==', 'customer.lists.type', 'default' ), |
|
300 | + $search->compare('==', 'customer.lists.parentid', $item->getId()), |
|
301 | + $search->compare('==', 'customer.lists.domain', 'text'), |
|
302 | + $search->compare('==', 'customer.lists.editor', $this->editor), |
|
303 | + $search->compare('==', 'customer.lists.type', 'default'), |
|
304 | 304 | ); |
305 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
306 | - $search->setSortations( array( $search->sort( '+', 'customer.lists.position' ) ) ); |
|
305 | + $search->setConditions($search->combine('&&', $expr)); |
|
306 | + $search->setSortations(array($search->sort('+', 'customer.lists.position'))); |
|
307 | 307 | |
308 | - return $this->object->searchItems( $search ); |
|
308 | + return $this->object->searchItems($search); |
|
309 | 309 | } |
310 | 310 | } |
@@ -16,29 +16,29 @@ discard block |
||
16 | 16 | protected function setUp() |
17 | 17 | { |
18 | 18 | $this->editor = \TestHelper::getContext()->getEditor(); |
19 | - $manager = \Aimeos\MShop\Customer\Manager\Factory::create( \TestHelper::getContext(), 'Laravel' ); |
|
19 | + $manager = \Aimeos\MShop\Customer\Manager\Factory::create(\TestHelper::getContext(), 'Laravel'); |
|
20 | 20 | |
21 | - $listManager = $manager->getSubManager( 'lists', 'Laravel' ); |
|
22 | - $this->object = $listManager->getSubManager( 'type', 'Laravel' ); |
|
21 | + $listManager = $manager->getSubManager('lists', 'Laravel'); |
|
22 | + $this->object = $listManager->getSubManager('type', 'Laravel'); |
|
23 | 23 | } |
24 | 24 | |
25 | 25 | |
26 | 26 | protected function tearDown() |
27 | 27 | { |
28 | - unset( $this->object ); |
|
28 | + unset($this->object); |
|
29 | 29 | } |
30 | 30 | |
31 | 31 | |
32 | 32 | public function testCleanup() |
33 | 33 | { |
34 | - $this->object->cleanup( array( -1 ) ); |
|
34 | + $this->object->cleanup(array( -1 )); |
|
35 | 35 | } |
36 | 36 | |
37 | 37 | |
38 | 38 | public function testCreateItem() |
39 | 39 | { |
40 | 40 | $item = $this->object->createItem(); |
41 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Type\\Iface', $item ); |
|
41 | + $this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Type\\Iface', $item); |
|
42 | 42 | } |
43 | 43 | |
44 | 44 | |
@@ -48,18 +48,18 @@ discard block |
||
48 | 48 | $search->setSlice(0, 1); |
49 | 49 | $results = $this->object->searchItems($search); |
50 | 50 | |
51 | - if( ( $expected = reset($results) ) === false ) { |
|
52 | - throw new \RuntimeException( 'No list type item found' ); |
|
51 | + if (($expected = reset($results)) === false) { |
|
52 | + throw new \RuntimeException('No list type item found'); |
|
53 | 53 | } |
54 | 54 | |
55 | - $this->assertEquals( $expected, $this->object->getItem( $expected->getId() ) ); |
|
55 | + $this->assertEquals($expected, $this->object->getItem($expected->getId())); |
|
56 | 56 | } |
57 | 57 | |
58 | 58 | |
59 | 59 | public function testGetSubManager() |
60 | 60 | { |
61 | - $this->setExpectedException( '\\Aimeos\\MShop\\Exception' ); |
|
62 | - $this->object->getSubManager( 'unknown' ); |
|
61 | + $this->setExpectedException('\\Aimeos\\MShop\\Exception'); |
|
62 | + $this->object->getSubManager('unknown'); |
|
63 | 63 | } |
64 | 64 | |
65 | 65 | |
@@ -69,51 +69,51 @@ discard block |
||
69 | 69 | $search->setSlice(0, 1); |
70 | 70 | $results = $this->object->searchItems($search); |
71 | 71 | |
72 | - if( ( $item = reset($results) ) === false ) { |
|
73 | - throw new \RuntimeException( 'No type item found' ); |
|
72 | + if (($item = reset($results)) === false) { |
|
73 | + throw new \RuntimeException('No type item found'); |
|
74 | 74 | } |
75 | 75 | |
76 | 76 | $item->setId(null); |
77 | - $item->setCode( 'unitTestInit' ); |
|
78 | - $resultSaved = $this->object->saveItem( $item ); |
|
79 | - $itemSaved = $this->object->getItem( $item->getId() ); |
|
77 | + $item->setCode('unitTestInit'); |
|
78 | + $resultSaved = $this->object->saveItem($item); |
|
79 | + $itemSaved = $this->object->getItem($item->getId()); |
|
80 | 80 | |
81 | 81 | $itemExp = clone $itemSaved; |
82 | - $itemExp->setCode( 'unitTestSave' ); |
|
83 | - $resultUpd = $this->object->saveItem( $itemExp ); |
|
84 | - $itemUpd = $this->object->getItem( $itemExp->getId() ); |
|
82 | + $itemExp->setCode('unitTestSave'); |
|
83 | + $resultUpd = $this->object->saveItem($itemExp); |
|
84 | + $itemUpd = $this->object->getItem($itemExp->getId()); |
|
85 | 85 | |
86 | - $this->object->deleteItem( $itemSaved->getId() ); |
|
86 | + $this->object->deleteItem($itemSaved->getId()); |
|
87 | 87 | |
88 | 88 | |
89 | - $this->assertTrue( $item->getId() !== null ); |
|
90 | - $this->assertEquals( $item->getId(), $itemSaved->getId() ); |
|
91 | - $this->assertEquals( $item->getSiteId(), $itemSaved->getSiteId() ); |
|
92 | - $this->assertEquals( $item->getCode(), $itemSaved->getCode() ); |
|
93 | - $this->assertEquals( $item->getDomain(), $itemSaved->getDomain() ); |
|
94 | - $this->assertEquals( $item->getLabel(), $itemSaved->getLabel() ); |
|
95 | - $this->assertEquals( $item->getStatus(), $itemSaved->getStatus() ); |
|
89 | + $this->assertTrue($item->getId() !== null); |
|
90 | + $this->assertEquals($item->getId(), $itemSaved->getId()); |
|
91 | + $this->assertEquals($item->getSiteId(), $itemSaved->getSiteId()); |
|
92 | + $this->assertEquals($item->getCode(), $itemSaved->getCode()); |
|
93 | + $this->assertEquals($item->getDomain(), $itemSaved->getDomain()); |
|
94 | + $this->assertEquals($item->getLabel(), $itemSaved->getLabel()); |
|
95 | + $this->assertEquals($item->getStatus(), $itemSaved->getStatus()); |
|
96 | 96 | |
97 | - $this->assertEquals( $this->editor, $itemSaved->getEditor() ); |
|
98 | - $this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated() ); |
|
99 | - $this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified() ); |
|
97 | + $this->assertEquals($this->editor, $itemSaved->getEditor()); |
|
98 | + $this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated()); |
|
99 | + $this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified()); |
|
100 | 100 | |
101 | - $this->assertEquals( $itemExp->getId(), $itemUpd->getId() ); |
|
102 | - $this->assertEquals( $itemExp->getSiteId(), $itemUpd->getSiteId() ); |
|
103 | - $this->assertEquals( $itemExp->getCode(), $itemUpd->getCode() ); |
|
104 | - $this->assertEquals( $itemExp->getDomain(), $itemUpd->getDomain() ); |
|
105 | - $this->assertEquals( $itemExp->getLabel(), $itemUpd->getLabel() ); |
|
106 | - $this->assertEquals( $itemExp->getStatus(), $itemUpd->getStatus() ); |
|
101 | + $this->assertEquals($itemExp->getId(), $itemUpd->getId()); |
|
102 | + $this->assertEquals($itemExp->getSiteId(), $itemUpd->getSiteId()); |
|
103 | + $this->assertEquals($itemExp->getCode(), $itemUpd->getCode()); |
|
104 | + $this->assertEquals($itemExp->getDomain(), $itemUpd->getDomain()); |
|
105 | + $this->assertEquals($itemExp->getLabel(), $itemUpd->getLabel()); |
|
106 | + $this->assertEquals($itemExp->getStatus(), $itemUpd->getStatus()); |
|
107 | 107 | |
108 | - $this->assertEquals( $this->editor, $itemUpd->getEditor() ); |
|
109 | - $this->assertEquals( $itemExp->getTimeCreated(), $itemUpd->getTimeCreated() ); |
|
110 | - $this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified() ); |
|
108 | + $this->assertEquals($this->editor, $itemUpd->getEditor()); |
|
109 | + $this->assertEquals($itemExp->getTimeCreated(), $itemUpd->getTimeCreated()); |
|
110 | + $this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified()); |
|
111 | 111 | |
112 | - $this->assertInstanceOf( \Aimeos\MShop\Common\Item\Iface::class, $resultSaved ); |
|
113 | - $this->assertInstanceOf( \Aimeos\MShop\Common\Item\Iface::class, $resultUpd ); |
|
112 | + $this->assertInstanceOf(\Aimeos\MShop\Common\Item\Iface::class, $resultSaved); |
|
113 | + $this->assertInstanceOf(\Aimeos\MShop\Common\Item\Iface::class, $resultUpd); |
|
114 | 114 | |
115 | 115 | $this->setExpectedException('\\Aimeos\\MShop\\Exception'); |
116 | - $this->object->getItem( $itemSaved->getId() ); |
|
116 | + $this->object->getItem($itemSaved->getId()); |
|
117 | 117 | } |
118 | 118 | |
119 | 119 | |
@@ -123,26 +123,26 @@ discard block |
||
123 | 123 | $search = $this->object->createSearch(); |
124 | 124 | |
125 | 125 | $expr = []; |
126 | - $expr[] = $search->compare( '!=', 'customer.lists.type.id', 0 ); |
|
127 | - $expr[] = $search->compare( '!=', 'customer.lists.type.siteid', null ); |
|
128 | - $expr[] = $search->compare( '==', 'customer.lists.type.code', 'default' ); |
|
129 | - $expr[] = $search->compare( '==', 'customer.lists.type.domain', 'text' ); |
|
130 | - $expr[] = $search->compare( '==', 'customer.lists.type.label', 'Standard' ); |
|
131 | - $expr[] = $search->compare( '>=', 'customer.lists.type.position', 0 ); |
|
132 | - $expr[] = $search->compare( '==', 'customer.lists.type.status', 1 ); |
|
133 | - $expr[] = $search->compare( '>=', 'customer.lists.type.mtime', '1970-01-01 00:00:00' ); |
|
134 | - $expr[] = $search->compare( '>=', 'customer.lists.type.ctime', '1970-01-01 00:00:00' ); |
|
135 | - $expr[] = $search->compare( '==', 'customer.lists.type.editor', $this->editor ); |
|
136 | - |
|
137 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
126 | + $expr[] = $search->compare('!=', 'customer.lists.type.id', 0); |
|
127 | + $expr[] = $search->compare('!=', 'customer.lists.type.siteid', null); |
|
128 | + $expr[] = $search->compare('==', 'customer.lists.type.code', 'default'); |
|
129 | + $expr[] = $search->compare('==', 'customer.lists.type.domain', 'text'); |
|
130 | + $expr[] = $search->compare('==', 'customer.lists.type.label', 'Standard'); |
|
131 | + $expr[] = $search->compare('>=', 'customer.lists.type.position', 0); |
|
132 | + $expr[] = $search->compare('==', 'customer.lists.type.status', 1); |
|
133 | + $expr[] = $search->compare('>=', 'customer.lists.type.mtime', '1970-01-01 00:00:00'); |
|
134 | + $expr[] = $search->compare('>=', 'customer.lists.type.ctime', '1970-01-01 00:00:00'); |
|
135 | + $expr[] = $search->compare('==', 'customer.lists.type.editor', $this->editor); |
|
136 | + |
|
137 | + $search->setConditions($search->combine('&&', $expr)); |
|
138 | 138 | $search->setSlice(0, 1); |
139 | 139 | |
140 | - $results = $this->object->searchItems( $search, [], $total ); |
|
141 | - $this->assertEquals( 1, count( $results ) ); |
|
142 | - $this->assertEquals( 1, $total ); |
|
140 | + $results = $this->object->searchItems($search, [], $total); |
|
141 | + $this->assertEquals(1, count($results)); |
|
142 | + $this->assertEquals(1, $total); |
|
143 | 143 | |
144 | - foreach($results as $itemId => $item) { |
|
145 | - $this->assertEquals( $itemId, $item->getId() ); |
|
144 | + foreach ($results as $itemId => $item) { |
|
145 | + $this->assertEquals($itemId, $item->getId()); |
|
146 | 146 | } |
147 | 147 | } |
148 | 148 |
@@ -20,89 +20,89 @@ discard block |
||
20 | 20 | $context = \TestHelper::getContext(); |
21 | 21 | $this->editor = $context->getEditor(); |
22 | 22 | |
23 | - $manager = \Aimeos\MShop\Customer\Manager\Factory::create( $context, 'Laravel' ); |
|
24 | - $this->object = $manager->getSubManager( 'property', 'Laravel' ); |
|
23 | + $manager = \Aimeos\MShop\Customer\Manager\Factory::create($context, 'Laravel'); |
|
24 | + $this->object = $manager->getSubManager('property', 'Laravel'); |
|
25 | 25 | } |
26 | 26 | |
27 | 27 | |
28 | 28 | protected function tearDown() |
29 | 29 | { |
30 | - unset( $this->object ); |
|
30 | + unset($this->object); |
|
31 | 31 | } |
32 | 32 | |
33 | 33 | |
34 | 34 | public function testCleanup() |
35 | 35 | { |
36 | - $this->object->cleanup( array( -1 ) ); |
|
36 | + $this->object->cleanup(array( -1 )); |
|
37 | 37 | } |
38 | 38 | |
39 | 39 | |
40 | 40 | public function testCreateItem() |
41 | 41 | { |
42 | 42 | $item = $this->object->createItem(); |
43 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Property\\Iface', $item ); |
|
43 | + $this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Property\\Iface', $item); |
|
44 | 44 | } |
45 | 45 | |
46 | 46 | |
47 | 47 | public function testSaveInvalid() |
48 | 48 | { |
49 | - $this->setExpectedException( \Aimeos\MW\Common\Exception::class ); |
|
50 | - $this->object->saveItem( new \Aimeos\MShop\Locale\Item\Standard() ); |
|
49 | + $this->setExpectedException(\Aimeos\MW\Common\Exception::class); |
|
50 | + $this->object->saveItem(new \Aimeos\MShop\Locale\Item\Standard()); |
|
51 | 51 | } |
52 | 52 | |
53 | 53 | |
54 | 54 | public function testSaveUpdateDeleteItem() |
55 | 55 | { |
56 | 56 | $search = $this->object->createSearch(); |
57 | - $search->setConditions( $search->compare( '==', 'customer.property.editor', $this->editor ) ); |
|
58 | - $results = $this->object->searchItems( $search ); |
|
57 | + $search->setConditions($search->compare('==', 'customer.property.editor', $this->editor)); |
|
58 | + $results = $this->object->searchItems($search); |
|
59 | 59 | |
60 | - if( ( $item = reset($results) ) === false ) { |
|
61 | - throw new \RuntimeException( 'No property item found' ); |
|
60 | + if (($item = reset($results)) === false) { |
|
61 | + throw new \RuntimeException('No property item found'); |
|
62 | 62 | } |
63 | 63 | |
64 | 64 | $item->setId(null); |
65 | - $item->setLanguageId( 'en' ); |
|
66 | - $resultSaved = $this->object->saveItem( $item ); |
|
67 | - $itemSaved = $this->object->getItem( $item->getId() ); |
|
65 | + $item->setLanguageId('en'); |
|
66 | + $resultSaved = $this->object->saveItem($item); |
|
67 | + $itemSaved = $this->object->getItem($item->getId()); |
|
68 | 68 | |
69 | 69 | $itemExp = clone $itemSaved; |
70 | - $itemExp->setValue( 'unittest' ); |
|
71 | - $resultUpd = $this->object->saveItem( $itemExp ); |
|
72 | - $itemUpd = $this->object->getItem( $itemExp->getId() ); |
|
70 | + $itemExp->setValue('unittest'); |
|
71 | + $resultUpd = $this->object->saveItem($itemExp); |
|
72 | + $itemUpd = $this->object->getItem($itemExp->getId()); |
|
73 | 73 | |
74 | - $this->object->deleteItem( $itemSaved->getId() ); |
|
74 | + $this->object->deleteItem($itemSaved->getId()); |
|
75 | 75 | |
76 | 76 | $context = \TestHelper::getContext(); |
77 | 77 | |
78 | - $this->assertTrue( $item->getId() !== null ); |
|
79 | - $this->assertEquals( $item->getId(), $itemSaved->getId() ); |
|
80 | - $this->assertEquals( $item->getParentId(), $itemSaved->getParentId() ); |
|
81 | - $this->assertEquals( $item->getSiteId(), $itemSaved->getSiteId() ); |
|
82 | - $this->assertEquals( $item->getType(), $itemSaved->getType() ); |
|
83 | - $this->assertEquals( $item->getLanguageId(), $itemSaved->getLanguageId() ); |
|
84 | - $this->assertEquals( $item->getValue(), $itemSaved->getValue() ); |
|
85 | - |
|
86 | - $this->assertEquals( $context->getEditor(), $itemSaved->getEditor() ); |
|
87 | - $this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated() ); |
|
88 | - $this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified() ); |
|
89 | - |
|
90 | - $this->assertEquals( $itemExp->getId(), $itemUpd->getId() ); |
|
91 | - $this->assertEquals( $itemExp->getParentId(), $itemUpd->getParentId() ); |
|
92 | - $this->assertEquals( $itemExp->getSiteId(), $itemUpd->getSiteId() ); |
|
93 | - $this->assertEquals( $itemExp->getType(), $itemUpd->getType() ); |
|
94 | - $this->assertEquals( $itemExp->getLanguageId(), $itemUpd->getLanguageId() ); |
|
95 | - $this->assertEquals( $itemExp->getValue(), $itemUpd->getValue() ); |
|
96 | - |
|
97 | - $this->assertEquals( $context->getEditor(), $itemUpd->getEditor() ); |
|
98 | - $this->assertEquals( $itemExp->getTimeCreated(), $itemUpd->getTimeCreated() ); |
|
99 | - $this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified() ); |
|
100 | - |
|
101 | - $this->assertInstanceOf( \Aimeos\MShop\Common\Item\Iface::class, $resultSaved ); |
|
102 | - $this->assertInstanceOf( \Aimeos\MShop\Common\Item\Iface::class, $resultUpd ); |
|
103 | - |
|
104 | - $this->setExpectedException( '\\Aimeos\\MShop\\Exception' ); |
|
105 | - $this->object->getItem( $itemSaved->getId() ); |
|
78 | + $this->assertTrue($item->getId() !== null); |
|
79 | + $this->assertEquals($item->getId(), $itemSaved->getId()); |
|
80 | + $this->assertEquals($item->getParentId(), $itemSaved->getParentId()); |
|
81 | + $this->assertEquals($item->getSiteId(), $itemSaved->getSiteId()); |
|
82 | + $this->assertEquals($item->getType(), $itemSaved->getType()); |
|
83 | + $this->assertEquals($item->getLanguageId(), $itemSaved->getLanguageId()); |
|
84 | + $this->assertEquals($item->getValue(), $itemSaved->getValue()); |
|
85 | + |
|
86 | + $this->assertEquals($context->getEditor(), $itemSaved->getEditor()); |
|
87 | + $this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated()); |
|
88 | + $this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified()); |
|
89 | + |
|
90 | + $this->assertEquals($itemExp->getId(), $itemUpd->getId()); |
|
91 | + $this->assertEquals($itemExp->getParentId(), $itemUpd->getParentId()); |
|
92 | + $this->assertEquals($itemExp->getSiteId(), $itemUpd->getSiteId()); |
|
93 | + $this->assertEquals($itemExp->getType(), $itemUpd->getType()); |
|
94 | + $this->assertEquals($itemExp->getLanguageId(), $itemUpd->getLanguageId()); |
|
95 | + $this->assertEquals($itemExp->getValue(), $itemUpd->getValue()); |
|
96 | + |
|
97 | + $this->assertEquals($context->getEditor(), $itemUpd->getEditor()); |
|
98 | + $this->assertEquals($itemExp->getTimeCreated(), $itemUpd->getTimeCreated()); |
|
99 | + $this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified()); |
|
100 | + |
|
101 | + $this->assertInstanceOf(\Aimeos\MShop\Common\Item\Iface::class, $resultSaved); |
|
102 | + $this->assertInstanceOf(\Aimeos\MShop\Common\Item\Iface::class, $resultUpd); |
|
103 | + |
|
104 | + $this->setExpectedException('\\Aimeos\\MShop\\Exception'); |
|
105 | + $this->object->getItem($itemSaved->getId()); |
|
106 | 106 | } |
107 | 107 | |
108 | 108 | |
@@ -110,18 +110,18 @@ discard block |
||
110 | 110 | { |
111 | 111 | $search = $this->object->createSearch(); |
112 | 112 | $conditions = array( |
113 | - $search->compare( '~=', 'customer.property.value', '1'), |
|
114 | - $search->compare( '==', 'customer.property.editor', $this->editor ) |
|
113 | + $search->compare('~=', 'customer.property.value', '1'), |
|
114 | + $search->compare('==', 'customer.property.editor', $this->editor) |
|
115 | 115 | ); |
116 | - $search->setConditions( $search->combine( '&&', $conditions ) ); |
|
117 | - $results = $this->object->searchItems( $search ); |
|
116 | + $search->setConditions($search->combine('&&', $conditions)); |
|
117 | + $results = $this->object->searchItems($search); |
|
118 | 118 | |
119 | - if( ($expected = reset($results)) === false ) { |
|
120 | - throw new \RuntimeException( sprintf( 'No customer property item found for value "%1$s".', '1' ) ); |
|
119 | + if (($expected = reset($results)) === false) { |
|
120 | + throw new \RuntimeException(sprintf('No customer property item found for value "%1$s".', '1')); |
|
121 | 121 | } |
122 | 122 | |
123 | - $actual = $this->object->getItem( $expected->getId() ); |
|
124 | - $this->assertEquals( $expected, $actual ); |
|
123 | + $actual = $this->object->getItem($expected->getId()); |
|
124 | + $this->assertEquals($expected, $actual); |
|
125 | 125 | } |
126 | 126 | |
127 | 127 | |
@@ -129,14 +129,14 @@ discard block |
||
129 | 129 | { |
130 | 130 | $result = $this->object->getResourceType(); |
131 | 131 | |
132 | - $this->assertContains( 'customer/property', $result ); |
|
132 | + $this->assertContains('customer/property', $result); |
|
133 | 133 | } |
134 | 134 | |
135 | 135 | |
136 | 136 | public function testGetSearchAttributes() |
137 | 137 | { |
138 | - foreach( $this->object->getSearchAttributes() as $attribute ) { |
|
139 | - $this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute ); |
|
138 | + foreach ($this->object->getSearchAttributes() as $attribute) { |
|
139 | + $this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute); |
|
140 | 140 | } |
141 | 141 | } |
142 | 142 | |
@@ -147,24 +147,24 @@ discard block |
||
147 | 147 | $search = $this->object->createSearch(); |
148 | 148 | |
149 | 149 | $expr = []; |
150 | - $expr[] = $search->compare( '!=', 'customer.property.id', null ); |
|
151 | - $expr[] = $search->compare( '!=', 'customer.property.parentid', null ); |
|
152 | - $expr[] = $search->compare( '!=', 'customer.property.siteid', null ); |
|
153 | - $expr[] = $search->compare( '==', 'customer.property.type', 'newsletter' ); |
|
154 | - $expr[] = $search->compare( '==', 'customer.property.languageid', null ); |
|
155 | - $expr[] = $search->compare( '==', 'customer.property.value', '1' ); |
|
156 | - $expr[] = $search->compare( '==', 'customer.property.editor', $this->editor ); |
|
157 | - |
|
158 | - $search->setConditions( $search->combine('&&', $expr) ); |
|
159 | - $results = $this->object->searchItems( $search, [], $total ); |
|
160 | - $this->assertEquals( 1, count( $results ) ); |
|
150 | + $expr[] = $search->compare('!=', 'customer.property.id', null); |
|
151 | + $expr[] = $search->compare('!=', 'customer.property.parentid', null); |
|
152 | + $expr[] = $search->compare('!=', 'customer.property.siteid', null); |
|
153 | + $expr[] = $search->compare('==', 'customer.property.type', 'newsletter'); |
|
154 | + $expr[] = $search->compare('==', 'customer.property.languageid', null); |
|
155 | + $expr[] = $search->compare('==', 'customer.property.value', '1'); |
|
156 | + $expr[] = $search->compare('==', 'customer.property.editor', $this->editor); |
|
157 | + |
|
158 | + $search->setConditions($search->combine('&&', $expr)); |
|
159 | + $results = $this->object->searchItems($search, [], $total); |
|
160 | + $this->assertEquals(1, count($results)); |
|
161 | 161 | } |
162 | 162 | |
163 | 163 | |
164 | 164 | public function testGetSubManager() |
165 | 165 | { |
166 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('type') ); |
|
167 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('type', 'Standard') ); |
|
166 | + $this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('type')); |
|
167 | + $this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('type', 'Standard')); |
|
168 | 168 | |
169 | 169 | $this->setExpectedException('\\Aimeos\\MShop\\Exception'); |
170 | 170 | $this->object->getSubManager('unknown'); |
@@ -20,8 +20,8 @@ discard block |
||
20 | 20 | $context = \TestHelper::getContext(); |
21 | 21 | $this->editor = $context->getEditor(); |
22 | 22 | |
23 | - $manager = \Aimeos\MShop\Customer\Manager\Factory::create( $context, 'Laravel' ); |
|
24 | - $this->object = $manager->getSubManager( 'property', 'Laravel' )->getSubManager( 'type', 'Laravel' ); |
|
23 | + $manager = \Aimeos\MShop\Customer\Manager\Factory::create($context, 'Laravel'); |
|
24 | + $this->object = $manager->getSubManager('property', 'Laravel')->getSubManager('type', 'Laravel'); |
|
25 | 25 | } |
26 | 26 | |
27 | 27 | |
@@ -33,13 +33,13 @@ discard block |
||
33 | 33 | |
34 | 34 | public function testCleanup() |
35 | 35 | { |
36 | - $this->object->cleanup( array( -1 ) ); |
|
36 | + $this->object->cleanup(array( -1 )); |
|
37 | 37 | } |
38 | 38 | |
39 | 39 | |
40 | 40 | public function testCreateItem() |
41 | 41 | { |
42 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Type\\Iface', $this->object->createItem() ); |
|
42 | + $this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Type\\Iface', $this->object->createItem()); |
|
43 | 43 | } |
44 | 44 | |
45 | 45 | |
@@ -47,14 +47,14 @@ discard block |
||
47 | 47 | { |
48 | 48 | $result = $this->object->getResourceType(); |
49 | 49 | |
50 | - $this->assertContains( 'customer/property/type', $result ); |
|
50 | + $this->assertContains('customer/property/type', $result); |
|
51 | 51 | } |
52 | 52 | |
53 | 53 | |
54 | 54 | public function testGetSearchAttributes() |
55 | 55 | { |
56 | - foreach( $this->object->getSearchAttributes() as $attribute ) { |
|
57 | - $this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute ); |
|
56 | + foreach ($this->object->getSearchAttributes() as $attribute) { |
|
57 | + $this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute); |
|
58 | 58 | } |
59 | 59 | } |
60 | 60 | |
@@ -63,82 +63,82 @@ discard block |
||
63 | 63 | { |
64 | 64 | $search = $this->object->createSearch(); |
65 | 65 | $conditions = array( |
66 | - $search->compare( '==', 'customer.property.type.code', 'newsletter' ), |
|
67 | - $search->compare( '==', 'customer.property.type.editor', $this->editor ) |
|
66 | + $search->compare('==', 'customer.property.type.code', 'newsletter'), |
|
67 | + $search->compare('==', 'customer.property.type.editor', $this->editor) |
|
68 | 68 | ); |
69 | - $search->setConditions( $search->combine( '&&', $conditions ) ); |
|
69 | + $search->setConditions($search->combine('&&', $conditions)); |
|
70 | 70 | |
71 | - $results = $this->object->searchItems( $search ); |
|
71 | + $results = $this->object->searchItems($search); |
|
72 | 72 | |
73 | - if( ($expected = reset($results) ) === false ) |
|
73 | + if (($expected = reset($results)) === false) |
|
74 | 74 | { |
75 | - throw new \RuntimeException( 'No property type item found.' ); |
|
75 | + throw new \RuntimeException('No property type item found.'); |
|
76 | 76 | } |
77 | 77 | |
78 | - $actual = $this->object->getItem( $expected->getId() ); |
|
78 | + $actual = $this->object->getItem($expected->getId()); |
|
79 | 79 | |
80 | - $this->assertEquals( $expected, $actual ); |
|
80 | + $this->assertEquals($expected, $actual); |
|
81 | 81 | } |
82 | 82 | |
83 | 83 | |
84 | 84 | public function testSaveInvalid() |
85 | 85 | { |
86 | - $this->setExpectedException( \Aimeos\MW\Common\Exception::class ); |
|
87 | - $this->object->saveItem( new \Aimeos\MShop\Locale\Item\Standard() ); |
|
86 | + $this->setExpectedException(\Aimeos\MW\Common\Exception::class); |
|
87 | + $this->object->saveItem(new \Aimeos\MShop\Locale\Item\Standard()); |
|
88 | 88 | } |
89 | 89 | |
90 | 90 | |
91 | 91 | public function testSaveUpdateDeleteItem() |
92 | 92 | { |
93 | 93 | $search = $this->object->createSearch(); |
94 | - $search->setConditions( $search->compare( '==', 'customer.property.type.editor', $this->editor ) ); |
|
94 | + $search->setConditions($search->compare('==', 'customer.property.type.editor', $this->editor)); |
|
95 | 95 | $results = $this->object->searchItems($search); |
96 | 96 | |
97 | - if( ( $item = reset($results) ) === false ) { |
|
98 | - throw new \RuntimeException( 'No type item found' ); |
|
97 | + if (($item = reset($results)) === false) { |
|
98 | + throw new \RuntimeException('No type item found'); |
|
99 | 99 | } |
100 | 100 | |
101 | 101 | $item->setId(null); |
102 | - $item->setCode( 'unitTestSave' ); |
|
103 | - $resultSaved = $this->object->saveItem( $item ); |
|
104 | - $itemSaved = $this->object->getItem( $item->getId() ); |
|
102 | + $item->setCode('unitTestSave'); |
|
103 | + $resultSaved = $this->object->saveItem($item); |
|
104 | + $itemSaved = $this->object->getItem($item->getId()); |
|
105 | 105 | |
106 | 106 | $itemExp = clone $itemSaved; |
107 | - $itemExp->setCode( 'unitTestSave2' ); |
|
108 | - $resultUpd = $this->object->saveItem( $itemExp ); |
|
109 | - $itemUpd = $this->object->getItem( $itemExp->getId() ); |
|
107 | + $itemExp->setCode('unitTestSave2'); |
|
108 | + $resultUpd = $this->object->saveItem($itemExp); |
|
109 | + $itemUpd = $this->object->getItem($itemExp->getId()); |
|
110 | 110 | |
111 | - $this->object->deleteItem( $itemSaved->getId() ); |
|
111 | + $this->object->deleteItem($itemSaved->getId()); |
|
112 | 112 | |
113 | 113 | |
114 | - $this->assertTrue( $item->getId() !== null ); |
|
115 | - $this->assertEquals( $item->getId(), $itemSaved->getId() ); |
|
116 | - $this->assertEquals( $item->getSiteId(), $itemSaved->getSiteId() ); |
|
117 | - $this->assertEquals( $item->getCode(), $itemSaved->getCode() ); |
|
118 | - $this->assertEquals( $item->getDomain(), $itemSaved->getDomain() ); |
|
119 | - $this->assertEquals( $item->getLabel(), $itemSaved->getLabel() ); |
|
120 | - $this->assertEquals( $item->getStatus(), $itemSaved->getStatus() ); |
|
114 | + $this->assertTrue($item->getId() !== null); |
|
115 | + $this->assertEquals($item->getId(), $itemSaved->getId()); |
|
116 | + $this->assertEquals($item->getSiteId(), $itemSaved->getSiteId()); |
|
117 | + $this->assertEquals($item->getCode(), $itemSaved->getCode()); |
|
118 | + $this->assertEquals($item->getDomain(), $itemSaved->getDomain()); |
|
119 | + $this->assertEquals($item->getLabel(), $itemSaved->getLabel()); |
|
120 | + $this->assertEquals($item->getStatus(), $itemSaved->getStatus()); |
|
121 | 121 | |
122 | - $this->assertEquals( $this->editor, $itemSaved->getEditor() ); |
|
123 | - $this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated() ); |
|
124 | - $this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified() ); |
|
122 | + $this->assertEquals($this->editor, $itemSaved->getEditor()); |
|
123 | + $this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated()); |
|
124 | + $this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified()); |
|
125 | 125 | |
126 | - $this->assertEquals( $itemExp->getId(), $itemUpd->getId() ); |
|
127 | - $this->assertEquals( $itemExp->getSiteId(), $itemUpd->getSiteId() ); |
|
128 | - $this->assertEquals( $itemExp->getCode(), $itemUpd->getCode() ); |
|
129 | - $this->assertEquals( $itemExp->getDomain(), $itemUpd->getDomain() ); |
|
130 | - $this->assertEquals( $itemExp->getLabel(), $itemUpd->getLabel() ); |
|
131 | - $this->assertEquals( $itemExp->getStatus(), $itemUpd->getStatus() ); |
|
126 | + $this->assertEquals($itemExp->getId(), $itemUpd->getId()); |
|
127 | + $this->assertEquals($itemExp->getSiteId(), $itemUpd->getSiteId()); |
|
128 | + $this->assertEquals($itemExp->getCode(), $itemUpd->getCode()); |
|
129 | + $this->assertEquals($itemExp->getDomain(), $itemUpd->getDomain()); |
|
130 | + $this->assertEquals($itemExp->getLabel(), $itemUpd->getLabel()); |
|
131 | + $this->assertEquals($itemExp->getStatus(), $itemUpd->getStatus()); |
|
132 | 132 | |
133 | - $this->assertEquals( $this->editor, $itemUpd->getEditor() ); |
|
134 | - $this->assertEquals( $itemExp->getTimeCreated(), $itemUpd->getTimeCreated() ); |
|
135 | - $this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified() ); |
|
133 | + $this->assertEquals($this->editor, $itemUpd->getEditor()); |
|
134 | + $this->assertEquals($itemExp->getTimeCreated(), $itemUpd->getTimeCreated()); |
|
135 | + $this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified()); |
|
136 | 136 | |
137 | - $this->assertInstanceOf( \Aimeos\MShop\Common\Item\Iface::class, $resultSaved ); |
|
138 | - $this->assertInstanceOf( \Aimeos\MShop\Common\Item\Iface::class, $resultUpd ); |
|
137 | + $this->assertInstanceOf(\Aimeos\MShop\Common\Item\Iface::class, $resultSaved); |
|
138 | + $this->assertInstanceOf(\Aimeos\MShop\Common\Item\Iface::class, $resultUpd); |
|
139 | 139 | |
140 | - $this->setExpectedException( '\\Aimeos\\MShop\\Exception' ); |
|
141 | - $this->object->getItem( $itemSaved->getId() ); |
|
140 | + $this->setExpectedException('\\Aimeos\\MShop\\Exception'); |
|
141 | + $this->object->getItem($itemSaved->getId()); |
|
142 | 142 | } |
143 | 143 | |
144 | 144 | |
@@ -148,36 +148,36 @@ discard block |
||
148 | 148 | $search = $this->object->createSearch(); |
149 | 149 | |
150 | 150 | $expr = []; |
151 | - $expr[] = $search->compare( '!=', 'customer.property.type.id', null ); |
|
152 | - $expr[] = $search->compare( '!=', 'customer.property.type.siteid', null ); |
|
153 | - $expr[] = $search->compare( '==', 'customer.property.type.domain', 'customer' ); |
|
154 | - $expr[] = $search->compare( '==', 'customer.property.type.code', 'newsletter' ); |
|
155 | - $expr[] = $search->compare( '>', 'customer.property.type.label', '' ); |
|
156 | - $expr[] = $search->compare( '>=', 'customer.property.type.position', 0 ); |
|
157 | - $expr[] = $search->compare( '==', 'customer.property.type.status', 1 ); |
|
158 | - $expr[] = $search->compare( '>=', 'customer.property.type.mtime', '1970-01-01 00:00:00' ); |
|
159 | - $expr[] = $search->compare( '>=', 'customer.property.type.ctime', '1970-01-01 00:00:00' ); |
|
160 | - $expr[] = $search->compare( '==', 'customer.property.type.editor', $this->editor ); |
|
161 | - |
|
162 | - $search->setConditions( $search->combine('&&', $expr) ); |
|
163 | - $results = $this->object->searchItems( $search, [], $total ); |
|
164 | - $this->assertEquals( 1, count( $results ) ); |
|
151 | + $expr[] = $search->compare('!=', 'customer.property.type.id', null); |
|
152 | + $expr[] = $search->compare('!=', 'customer.property.type.siteid', null); |
|
153 | + $expr[] = $search->compare('==', 'customer.property.type.domain', 'customer'); |
|
154 | + $expr[] = $search->compare('==', 'customer.property.type.code', 'newsletter'); |
|
155 | + $expr[] = $search->compare('>', 'customer.property.type.label', ''); |
|
156 | + $expr[] = $search->compare('>=', 'customer.property.type.position', 0); |
|
157 | + $expr[] = $search->compare('==', 'customer.property.type.status', 1); |
|
158 | + $expr[] = $search->compare('>=', 'customer.property.type.mtime', '1970-01-01 00:00:00'); |
|
159 | + $expr[] = $search->compare('>=', 'customer.property.type.ctime', '1970-01-01 00:00:00'); |
|
160 | + $expr[] = $search->compare('==', 'customer.property.type.editor', $this->editor); |
|
161 | + |
|
162 | + $search->setConditions($search->combine('&&', $expr)); |
|
163 | + $results = $this->object->searchItems($search, [], $total); |
|
164 | + $this->assertEquals(1, count($results)); |
|
165 | 165 | |
166 | 166 | |
167 | 167 | $search = $this->object->createSearch(); |
168 | 168 | $conditions = array( |
169 | - $search->compare( '=~', 'customer.property.type.code', 'newsletter'), |
|
170 | - $search->compare( '==', 'customer.property.type.editor', $this->editor ) |
|
169 | + $search->compare('=~', 'customer.property.type.code', 'newsletter'), |
|
170 | + $search->compare('==', 'customer.property.type.editor', $this->editor) |
|
171 | 171 | ); |
172 | - $search->setConditions( $search->combine('&&', $conditions ) ); |
|
172 | + $search->setConditions($search->combine('&&', $conditions)); |
|
173 | 173 | $search->setSlice(0, 1); |
174 | - $items = $this->object->searchItems( $search, [], $total); |
|
174 | + $items = $this->object->searchItems($search, [], $total); |
|
175 | 175 | |
176 | - $this->assertEquals( 1, count( $items ) ); |
|
177 | - $this->assertEquals( 1, $total ); |
|
176 | + $this->assertEquals(1, count($items)); |
|
177 | + $this->assertEquals(1, $total); |
|
178 | 178 | |
179 | - foreach($items as $itemId => $item) { |
|
180 | - $this->assertEquals( $itemId, $item->getId() ); |
|
179 | + foreach ($items as $itemId => $item) { |
|
180 | + $this->assertEquals($itemId, $item->getId()); |
|
181 | 181 | } |
182 | 182 | } |
183 | 183 |