@@ -4,17 +4,17 @@ |
||
| 4 | 4 | * Set error reporting to maximum |
| 5 | 5 | */ |
| 6 | 6 | error_reporting( -1 ); |
| 7 | -ini_set( 'display_errors', true ); |
|
| 7 | +ini_set('display_errors', true); |
|
| 8 | 8 | |
| 9 | -date_default_timezone_set( 'UTC' ); |
|
| 9 | +date_default_timezone_set('UTC'); |
|
| 10 | 10 | |
| 11 | 11 | /* |
| 12 | 12 | * Set locale settings to reasonable defaults |
| 13 | 13 | */ |
| 14 | -setlocale( LC_ALL, 'en_US.UTF-8' ); |
|
| 15 | -setlocale( LC_CTYPE, 'en_US.UTF-8' ); |
|
| 16 | -setlocale( LC_NUMERIC, 'POSIX' ); |
|
| 17 | -setlocale( LC_TIME, 'POSIX' ); |
|
| 14 | +setlocale(LC_ALL, 'en_US.UTF-8'); |
|
| 15 | +setlocale(LC_CTYPE, 'en_US.UTF-8'); |
|
| 16 | +setlocale(LC_NUMERIC, 'POSIX'); |
|
| 17 | +setlocale(LC_TIME, 'POSIX'); |
|
| 18 | 18 | |
| 19 | 19 | |
| 20 | 20 | require_once 'TestHelper.php'; |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | */ |
| 45 | 45 | public function getPostDependencies() |
| 46 | 46 | { |
| 47 | - return array( 'TablesCreateFosUser' ); |
|
| 47 | + return array('TablesCreateFosUser'); |
|
| 48 | 48 | } |
| 49 | 49 | |
| 50 | 50 | |
@@ -53,23 +53,23 @@ discard block |
||
| 53 | 53 | */ |
| 54 | 54 | public function migrate() |
| 55 | 55 | { |
| 56 | - $this->msg( 'Adding indexes from "fos_user"', 0 ); $this->status( '' ); |
|
| 56 | + $this->msg('Adding indexes from "fos_user"', 0); $this->status(''); |
|
| 57 | 57 | |
| 58 | - $schema = $this->getSchema( 'db-customer' ); |
|
| 58 | + $schema = $this->getSchema('db-customer'); |
|
| 59 | 59 | |
| 60 | - foreach( $this->list as $idx => $stmt ) |
|
| 60 | + foreach ($this->list as $idx => $stmt) |
|
| 61 | 61 | { |
| 62 | - $this->msg( sprintf( 'Checking index "%1$s"', $idx ), 0 ); |
|
| 62 | + $this->msg(sprintf('Checking index "%1$s"', $idx), 0); |
|
| 63 | 63 | |
| 64 | - if( $schema->tableExists( 'fos_user' ) === true |
|
| 65 | - && $schema->indexExists( 'fos_user', $idx ) === false ) |
|
| 64 | + if ($schema->tableExists('fos_user') === true |
|
| 65 | + && $schema->indexExists('fos_user', $idx) === false) |
|
| 66 | 66 | { |
| 67 | - $this->execute( $stmt ); |
|
| 68 | - $this->status( 'done' ); |
|
| 67 | + $this->execute($stmt); |
|
| 68 | + $this->status('done'); |
|
| 69 | 69 | } |
| 70 | 70 | else |
| 71 | 71 | { |
| 72 | - $this->status( 'OK' ); |
|
| 72 | + $this->status('OK'); |
|
| 73 | 73 | } |
| 74 | 74 | } |
| 75 | 75 | } |
@@ -21,7 +21,7 @@ discard block |
||
| 21 | 21 | */ |
| 22 | 22 | public function getPreDependencies() |
| 23 | 23 | { |
| 24 | - return array( 'TablesCreateFosUser' ); |
|
| 24 | + return array('TablesCreateFosUser'); |
|
| 25 | 25 | } |
| 26 | 26 | |
| 27 | 27 | |
@@ -31,38 +31,38 @@ 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 Fos user bundle customer test data', 0 ); |
|
| 38 | + $this->msg('Adding Fos user bundle customer test data', 0); |
|
| 39 | 39 | |
| 40 | 40 | $parentIds = []; |
| 41 | 41 | $ds = DIRECTORY_SEPARATOR; |
| 42 | - $this->additional->setEditor( 'ai-fosuser:unittest' ); |
|
| 42 | + $this->additional->setEditor('ai-fosuser:unittest'); |
|
| 43 | 43 | $path = __DIR__ . $ds . 'data' . $ds . 'customer.php'; |
| 44 | 44 | |
| 45 | - if( ( $testdata = include( $path ) ) === false ){ |
|
| 46 | - throw new \Aimeos\MShop\Exception( sprintf( 'No file "%1$s" found for customer domain', $path ) ); |
|
| 45 | + if (($testdata = include($path)) === false) { |
|
| 46 | + throw new \Aimeos\MShop\Exception(sprintf('No file "%1$s" found for customer domain', $path)); |
|
| 47 | 47 | } |
| 48 | 48 | |
| 49 | 49 | |
| 50 | - $customerManager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $this->additional, 'FosUser' ); |
|
| 51 | - $customerAddressManager = $customerManager->getSubManager( 'address', 'FosUser' ); |
|
| 50 | + $customerManager = \Aimeos\MShop\Customer\Manager\Factory::createManager($this->additional, 'FosUser'); |
|
| 51 | + $customerAddressManager = $customerManager->getSubManager('address', 'FosUser'); |
|
| 52 | 52 | |
| 53 | 53 | $search = $customerManager->createSearch(); |
| 54 | - $search->setConditions( $search->compare( '==', 'customer.code', array( 'UTC001', 'UTC002', 'UTC003' ) ) ); |
|
| 55 | - $items = $customerManager->searchItems( $search ); |
|
| 54 | + $search->setConditions($search->compare('==', 'customer.code', array('UTC001', 'UTC002', 'UTC003'))); |
|
| 55 | + $items = $customerManager->searchItems($search); |
|
| 56 | 56 | |
| 57 | 57 | $this->conn->begin(); |
| 58 | 58 | |
| 59 | - $customerManager->deleteItems( array_keys( $items ) ); |
|
| 60 | - $parentIds = $this->addCustomerData( $testdata, $customerManager, $customerAddressManager->createItem() ); |
|
| 61 | - $this->addCustomerAddressData( $testdata, $customerAddressManager, $parentIds ); |
|
| 59 | + $customerManager->deleteItems(array_keys($items)); |
|
| 60 | + $parentIds = $this->addCustomerData($testdata, $customerManager, $customerAddressManager->createItem()); |
|
| 61 | + $this->addCustomerAddressData($testdata, $customerAddressManager, $parentIds); |
|
| 62 | 62 | |
| 63 | 63 | $this->conn->commit(); |
| 64 | 64 | |
| 65 | 65 | |
| 66 | - $this->status( 'done' ); |
|
| 66 | + $this->status('done'); |
|
| 67 | 67 | } |
| 68 | 68 | } |
@@ -22,7 +22,7 @@ discard block |
||
| 22 | 22 | */ |
| 23 | 23 | public function getPreDependencies() |
| 24 | 24 | { |
| 25 | - return array( 'TablesCreateFosUser', 'CustomerAddFosUserTestData', 'LocaleAddTestData', 'TextAddTestData' ); |
|
| 25 | + return array('TablesCreateFosUser', 'CustomerAddFosUserTestData', 'LocaleAddTestData', 'TextAddTestData'); |
|
| 26 | 26 | } |
| 27 | 27 | |
| 28 | 28 | |
@@ -32,29 +32,29 @@ discard block |
||
| 32 | 32 | 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 Fos user bundle test data', 0 ); |
|
| 40 | - $this->additional->setEditor( 'ai-fosuser:unittest' ); |
|
| 39 | + $this->msg('Adding customer-list Fos user bundle test data', 0); |
|
| 40 | + $this->additional->setEditor('ai-fosuser:unittest'); |
|
| 41 | 41 | |
| 42 | 42 | $ds = DIRECTORY_SEPARATOR; |
| 43 | - $path = dirname( __FILE__ ) . $ds . 'data' . $ds . 'customer-list.php'; |
|
| 43 | + $path = dirname(__FILE__) . $ds . 'data' . $ds . 'customer-list.php'; |
|
| 44 | 44 | |
| 45 | - if( ( $testdata = include( $path ) ) === false ){ |
|
| 46 | - throw new \Aimeos\MShop\Exception( sprintf( 'No file "%1$s" found for customer list domain', $path ) ); |
|
| 45 | + if (($testdata = include($path)) === false) { |
|
| 46 | + throw new \Aimeos\MShop\Exception(sprintf('No file "%1$s" found for customer list domain', $path)); |
|
| 47 | 47 | } |
| 48 | 48 | |
| 49 | 49 | $refKeys = []; |
| 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, 'FosUser' ); |
|
| 55 | + $refIds['text'] = $this->getTextData($refKeys['text']); |
|
| 56 | + $this->addCustomerListData($testdata, $refIds, 'FosUser'); |
|
| 57 | 57 | |
| 58 | - $this->status( 'done' ); |
|
| 58 | + $this->status('done'); |
|
| 59 | 59 | } |
| 60 | 60 | } |
@@ -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,13 +34,13 @@ 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 ), true ); |
|
| 42 | + $extdir = dirname(dirname(dirname(__DIR__))); |
|
| 43 | + self::$aimeos = new \Aimeos\Bootstrap(array($extdir), true); |
|
| 44 | 44 | } |
| 45 | 45 | |
| 46 | 46 | return self::$aimeos; |
@@ -50,45 +50,45 @@ discard block |
||
| 50 | 50 | /** |
| 51 | 51 | * @param string $site |
| 52 | 52 | */ |
| 53 | - private static function createContext( $site ) |
|
| 53 | + private static function createContext($site) |
|
| 54 | 54 | { |
| 55 | 55 | $ctx = new \Aimeos\MShop\Context\Item\Standard(); |
| 56 | 56 | $aimeos = self::getAimeos(); |
| 57 | 57 | |
| 58 | 58 | |
| 59 | - $paths = $aimeos->getConfigPaths( 'mysql' ); |
|
| 59 | + $paths = $aimeos->getConfigPaths('mysql'); |
|
| 60 | 60 | $paths[] = __DIR__ . DIRECTORY_SEPARATOR . 'config'; |
| 61 | 61 | |
| 62 | - $conf = new \Aimeos\MW\Config\PHPArray( [], $paths ); |
|
| 63 | - $ctx->setConfig( $conf ); |
|
| 62 | + $conf = new \Aimeos\MW\Config\PHPArray([], $paths); |
|
| 63 | + $ctx->setConfig($conf); |
|
| 64 | 64 | |
| 65 | 65 | |
| 66 | - $dbm = new \Aimeos\MW\DB\Manager\PDO( $conf ); |
|
| 67 | - $ctx->setDatabaseManager( $dbm ); |
|
| 66 | + $dbm = new \Aimeos\MW\DB\Manager\PDO($conf); |
|
| 67 | + $ctx->setDatabaseManager($dbm); |
|
| 68 | 68 | |
| 69 | 69 | |
| 70 | - $logger = new \Aimeos\MW\Logger\File( $site . '.log', \Aimeos\MW\Logger\Base::DEBUG ); |
|
| 71 | - $ctx->setLogger( $logger ); |
|
| 70 | + $logger = new \Aimeos\MW\Logger\File($site . '.log', \Aimeos\MW\Logger\Base::DEBUG); |
|
| 71 | + $ctx->setLogger($logger); |
|
| 72 | 72 | |
| 73 | 73 | |
| 74 | 74 | $cache = new \Aimeos\MW\Cache\None(); |
| 75 | - $ctx->setCache( $cache ); |
|
| 75 | + $ctx->setCache($cache); |
|
| 76 | 76 | |
| 77 | 77 | |
| 78 | - $i18n = new \Aimeos\MW\Translation\None( 'de' ); |
|
| 79 | - $ctx->setI18n( array( 'de' => $i18n ) ); |
|
| 78 | + $i18n = new \Aimeos\MW\Translation\None('de'); |
|
| 79 | + $ctx->setI18n(array('de' => $i18n)); |
|
| 80 | 80 | |
| 81 | 81 | |
| 82 | 82 | $session = new \Aimeos\MW\Session\None(); |
| 83 | - $ctx->setSession( $session ); |
|
| 83 | + $ctx->setSession($session); |
|
| 84 | 84 | |
| 85 | 85 | |
| 86 | - $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $ctx ); |
|
| 87 | - $localeItem = $localeManager->bootstrap( $site, '', '', false ); |
|
| 86 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($ctx); |
|
| 87 | + $localeItem = $localeManager->bootstrap($site, '', '', false); |
|
| 88 | 88 | |
| 89 | - $ctx->setLocale( $localeItem ); |
|
| 89 | + $ctx->setLocale($localeItem); |
|
| 90 | 90 | |
| 91 | - $ctx->setEditor( 'ai-fosuser:unittest' ); |
|
| 91 | + $ctx->setEditor('ai-fosuser:unittest'); |
|
| 92 | 92 | |
| 93 | 93 | return $ctx; |
| 94 | 94 | } |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | 'customer.lists.type.id' => array( |
| 26 | 26 | 'code'=>'customer.lists.type.id', |
| 27 | 27 | 'internalcode'=>'foslity."id"', |
| 28 | - 'internaldeps'=>array( 'LEFT JOIN "fos_user_list_type" AS foslity ON ( fosli."typeid" = foslity."id" )' ), |
|
| 28 | + 'internaldeps'=>array('LEFT JOIN "fos_user_list_type" AS foslity ON ( fosli."typeid" = foslity."id" )'), |
|
| 29 | 29 | 'label'=>'Customer list type ID', |
| 30 | 30 | 'type'=> 'integer', |
| 31 | 31 | 'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT, |
@@ -96,14 +96,14 @@ discard block |
||
| 96 | 96 | * |
| 97 | 97 | * @param array $siteids List of IDs for sites whose entries should be deleted |
| 98 | 98 | */ |
| 99 | - public function cleanup( array $siteids ) |
|
| 99 | + public function cleanup(array $siteids) |
|
| 100 | 100 | { |
| 101 | 101 | $path = 'mshop/customer/manager/lists/type/submanagers'; |
| 102 | - foreach( $this->getContext()->getConfig()->get( $path, [] ) as $domain ) { |
|
| 103 | - $this->getObject()->getSubManager( $domain )->cleanup( $siteids ); |
|
| 102 | + foreach ($this->getContext()->getConfig()->get($path, []) as $domain) { |
|
| 103 | + $this->getObject()->getSubManager($domain)->cleanup($siteids); |
|
| 104 | 104 | } |
| 105 | 105 | |
| 106 | - $this->cleanupBase( $siteids, 'mshop/customer/manager/lists/type/fosuser/delete' ); |
|
| 106 | + $this->cleanupBase($siteids, 'mshop/customer/manager/lists/type/fosuser/delete'); |
|
| 107 | 107 | } |
| 108 | 108 | |
| 109 | 109 | |
@@ -113,11 +113,11 @@ discard block |
||
| 113 | 113 | * @param boolean $withsub Return also attributes of sub-managers if true |
| 114 | 114 | * @return array List of attribute items implementing \Aimeos\MW\Criteria\Attribute\Iface |
| 115 | 115 | */ |
| 116 | - public function getSearchAttributes( $withsub = true ) |
|
| 116 | + public function getSearchAttributes($withsub = true) |
|
| 117 | 117 | { |
| 118 | 118 | $path = 'mshop/customer/manager/lists/type/submanagers'; |
| 119 | 119 | |
| 120 | - return $this->getSearchAttributesBase( $this->searchConfig, $path, [], $withsub ); |
|
| 120 | + return $this->getSearchAttributesBase($this->searchConfig, $path, [], $withsub); |
|
| 121 | 121 | } |
| 122 | 122 | |
| 123 | 123 | |
@@ -128,9 +128,9 @@ discard block |
||
| 128 | 128 | * @param string|null $name Name of the implementation, will be from configuration (or Default) if null |
| 129 | 129 | * @return mixed Manager for different extensions, e.g stock, tags, locations, etc. |
| 130 | 130 | */ |
| 131 | - public function getSubManager( $manager, $name = null ) |
|
| 131 | + public function getSubManager($manager, $name = null) |
|
| 132 | 132 | { |
| 133 | - return $this->getSubManagerBase( 'customer', 'lists/type/' . $manager, ( $name === null ? 'FosUser' : $name ) ); |
|
| 133 | + return $this->getSubManagerBase('customer', 'lists/type/' . $manager, ($name === null ? 'FosUser' : $name)); |
|
| 134 | 134 | } |
| 135 | 135 | |
| 136 | 136 | |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | 'customer.lists.id'=> array( |
| 26 | 26 | 'code'=>'customer.lists.id', |
| 27 | 27 | 'internalcode'=>'fosli."id"', |
| 28 | - 'internaldeps' => array( 'LEFT JOIN "fos_user_list" AS fosli ON ( fos."id" = fosli."parentid" )' ), |
|
| 28 | + 'internaldeps' => array('LEFT JOIN "fos_user_list" AS fosli ON ( fos."id" = fosli."parentid" )'), |
|
| 29 | 29 | 'label'=>'Customer list ID', |
| 30 | 30 | 'type'=> 'integer', |
| 31 | 31 | 'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_INT, |
@@ -133,14 +133,14 @@ discard block |
||
| 133 | 133 | * |
| 134 | 134 | * @param array $siteids List of IDs for sites whose entries should be deleted |
| 135 | 135 | */ |
| 136 | - public function cleanup( array $siteids ) |
|
| 136 | + public function cleanup(array $siteids) |
|
| 137 | 137 | { |
| 138 | 138 | $path = 'mshop/customer/manager/lists/submanagers'; |
| 139 | - foreach( $this->getContext()->getConfig()->get( $path, array( 'type' ) ) as $domain ) { |
|
| 140 | - $this->getObject()->getSubManager( $domain )->cleanup( $siteids ); |
|
| 139 | + foreach ($this->getContext()->getConfig()->get($path, array('type')) as $domain) { |
|
| 140 | + $this->getObject()->getSubManager($domain)->cleanup($siteids); |
|
| 141 | 141 | } |
| 142 | 142 | |
| 143 | - $this->cleanupBase( $siteids, 'mshop/customer/manager/lists/fosuser/delete' ); |
|
| 143 | + $this->cleanupBase($siteids, 'mshop/customer/manager/lists/fosuser/delete'); |
|
| 144 | 144 | } |
| 145 | 145 | |
| 146 | 146 | |
@@ -150,11 +150,11 @@ discard block |
||
| 150 | 150 | * @param boolean $withsub Return also attributes of sub-managers if true |
| 151 | 151 | * @return array List of attribute items implementing \Aimeos\MW\Criteria\Attribute\Iface |
| 152 | 152 | */ |
| 153 | - public function getSearchAttributes( $withsub = true ) |
|
| 153 | + public function getSearchAttributes($withsub = true) |
|
| 154 | 154 | { |
| 155 | 155 | $path = 'mshop/customer/manager/lists/submanagers'; |
| 156 | 156 | |
| 157 | - return $this->getSearchAttributesBase( $this->searchConfig, $path, array( 'type' ), $withsub ); |
|
| 157 | + return $this->getSearchAttributesBase($this->searchConfig, $path, array('type'), $withsub); |
|
| 158 | 158 | } |
| 159 | 159 | |
| 160 | 160 | |
@@ -165,9 +165,9 @@ discard block |
||
| 165 | 165 | * @param string|null $name Name of the implementation, will be from configuration (or Default) if null |
| 166 | 166 | * @return mixed Manager for different extensions, e.g stock, tags, locations, etc. |
| 167 | 167 | */ |
| 168 | - public function getSubManager( $manager, $name = null ) |
|
| 168 | + public function getSubManager($manager, $name = null) |
|
| 169 | 169 | { |
| 170 | - return $this->getSubManagerBase( 'customer', 'lists/' . $manager, ( $name === null ? 'FosUser' : $name ) ); |
|
| 170 | + return $this->getSubManagerBase('customer', 'lists/' . $manager, ($name === null ? 'FosUser' : $name)); |
|
| 171 | 171 | } |
| 172 | 172 | |
| 173 | 173 | |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | 'label' => 'Customer address ID', |
| 27 | 27 | 'code' => 'customer.address.id', |
| 28 | 28 | 'internalcode' => 'fosad."id"', |
| 29 | - 'internaldeps' => array( 'LEFT JOIN "fos_user_address" AS fosad ON ( fos."id" = fosad."parentid" )' ), |
|
| 29 | + 'internaldeps' => array('LEFT JOIN "fos_user_address" AS fosad ON ( fos."id" = fosad."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->getObject()->getSubManager( $domain )->cleanup( $siteids ); |
|
| 229 | + foreach ($this->getContext()->getConfig()->get($path, []) as $domain) { |
|
| 230 | + $this->getObject()->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/fosuser/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 ? 'FosUser' : $name ) ); |
|
| 270 | + return $this->getSubManagerBase('customer', 'address/' . $manager, ($name === null ? 'FosUser' : $name)); |
|
| 271 | 271 | } |
| 272 | 272 | |
| 273 | 273 | |
@@ -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::createManager( $this->context, 'FosUser' ); |
|
| 22 | - $this->object = $manager->getSubManager( 'lists', 'FosUser' ); |
|
| 21 | + $manager = \Aimeos\MShop\Customer\Manager\Factory::createManager($this->context, 'FosUser'); |
|
| 22 | + $this->object = $manager->getSubManager('lists', 'FosUser'); |
|
| 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-fosuser:unittest' ), |
|
| 43 | + $search->compare('==', 'customer.lists.editor', 'ai-fosuser: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,147 +76,147 @@ 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->assertTrue( $itemSaved->getType() !== null ); |
|
| 100 | - $this->assertEquals( $item->getId(), $itemSaved->getId() ); |
|
| 101 | - $this->assertEquals( $item->getSiteId(), $itemSaved->getSiteId() ); |
|
| 102 | - $this->assertEquals( $item->getParentId(), $itemSaved->getParentId() ); |
|
| 103 | - $this->assertEquals( $item->getTypeId(), $itemSaved->getTypeId() ); |
|
| 104 | - $this->assertEquals( $item->getRefId(), $itemSaved->getRefId() ); |
|
| 105 | - $this->assertEquals( $item->getDomain(), $itemSaved->getDomain() ); |
|
| 106 | - $this->assertEquals( $item->getDateStart(), $itemSaved->getDateStart() ); |
|
| 107 | - $this->assertEquals( $item->getDateEnd(), $itemSaved->getDateEnd() ); |
|
| 108 | - $this->assertEquals( $item->getPosition(), $itemSaved->getPosition() ); |
|
| 109 | - $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->assertTrue($itemSaved->getType() !== null); |
|
| 100 | + $this->assertEquals($item->getId(), $itemSaved->getId()); |
|
| 101 | + $this->assertEquals($item->getSiteId(), $itemSaved->getSiteId()); |
|
| 102 | + $this->assertEquals($item->getParentId(), $itemSaved->getParentId()); |
|
| 103 | + $this->assertEquals($item->getTypeId(), $itemSaved->getTypeId()); |
|
| 104 | + $this->assertEquals($item->getRefId(), $itemSaved->getRefId()); |
|
| 105 | + $this->assertEquals($item->getDomain(), $itemSaved->getDomain()); |
|
| 106 | + $this->assertEquals($item->getDateStart(), $itemSaved->getDateStart()); |
|
| 107 | + $this->assertEquals($item->getDateEnd(), $itemSaved->getDateEnd()); |
|
| 108 | + $this->assertEquals($item->getPosition(), $itemSaved->getPosition()); |
|
| 109 | + $this->assertEquals($this->editor, $itemSaved->getEditor()); |
|
| 110 | 110 | $this->assertStringStartsWith(date('Y-m-d', time()), $itemSaved->getTimeCreated()); |
| 111 | 111 | $this->assertStringStartsWith(date('Y-m-d', time()), $itemSaved->getTimeModified()); |
| 112 | 112 | |
| 113 | - $this->assertEquals( $this->editor, $itemSaved->getEditor() ); |
|
| 114 | - $this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated() ); |
|
| 115 | - $this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified() ); |
|
| 113 | + $this->assertEquals($this->editor, $itemSaved->getEditor()); |
|
| 114 | + $this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated()); |
|
| 115 | + $this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified()); |
|
| 116 | 116 | |
| 117 | - $this->assertTrue( $itemUpd->getType() !== null ); |
|
| 118 | - $this->assertEquals( $itemExp->getId(), $itemUpd->getId() ); |
|
| 119 | - $this->assertEquals( $itemExp->getSiteId(), $itemUpd->getSiteId() ); |
|
| 120 | - $this->assertEquals( $itemExp->getParentId(), $itemUpd->getParentId() ); |
|
| 121 | - $this->assertEquals( $itemExp->getTypeId(), $itemUpd->getTypeId() ); |
|
| 122 | - $this->assertEquals( $itemExp->getRefId(), $itemUpd->getRefId() ); |
|
| 123 | - $this->assertEquals( $itemExp->getDomain(), $itemUpd->getDomain() ); |
|
| 124 | - $this->assertEquals( $itemExp->getDateStart(), $itemUpd->getDateStart() ); |
|
| 125 | - $this->assertEquals( $itemExp->getDateEnd(), $itemUpd->getDateEnd() ); |
|
| 126 | - $this->assertEquals( $itemExp->getPosition(), $itemUpd->getPosition() ); |
|
| 117 | + $this->assertTrue($itemUpd->getType() !== null); |
|
| 118 | + $this->assertEquals($itemExp->getId(), $itemUpd->getId()); |
|
| 119 | + $this->assertEquals($itemExp->getSiteId(), $itemUpd->getSiteId()); |
|
| 120 | + $this->assertEquals($itemExp->getParentId(), $itemUpd->getParentId()); |
|
| 121 | + $this->assertEquals($itemExp->getTypeId(), $itemUpd->getTypeId()); |
|
| 122 | + $this->assertEquals($itemExp->getRefId(), $itemUpd->getRefId()); |
|
| 123 | + $this->assertEquals($itemExp->getDomain(), $itemUpd->getDomain()); |
|
| 124 | + $this->assertEquals($itemExp->getDateStart(), $itemUpd->getDateStart()); |
|
| 125 | + $this->assertEquals($itemExp->getDateEnd(), $itemUpd->getDateEnd()); |
|
| 126 | + $this->assertEquals($itemExp->getPosition(), $itemUpd->getPosition()); |
|
| 127 | 127 | |
| 128 | - $this->assertEquals( $this->editor, $itemUpd->getEditor() ); |
|
| 129 | - $this->assertEquals( $itemExp->getTimeCreated(), $itemUpd->getTimeCreated() ); |
|
| 130 | - $this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified() ); |
|
| 128 | + $this->assertEquals($this->editor, $itemUpd->getEditor()); |
|
| 129 | + $this->assertEquals($itemExp->getTimeCreated(), $itemUpd->getTimeCreated()); |
|
| 130 | + $this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified()); |
|
| 131 | 131 | |
| 132 | - $this->assertInstanceOf( '\Aimeos\MShop\Common\Item\Iface', $resultSaved ); |
|
| 133 | - $this->assertInstanceOf( '\Aimeos\MShop\Common\Item\Iface', $resultUpd ); |
|
| 132 | + $this->assertInstanceOf('\Aimeos\MShop\Common\Item\Iface', $resultSaved); |
|
| 133 | + $this->assertInstanceOf('\Aimeos\MShop\Common\Item\Iface', $resultUpd); |
|
| 134 | 134 | |
| 135 | 135 | $this->setExpectedException('\\Aimeos\\MShop\\Exception'); |
| 136 | - $this->object->getItem( $itemSaved->getId() ); |
|
| 136 | + $this->object->getItem($itemSaved->getId()); |
|
| 137 | 137 | } |
| 138 | 138 | |
| 139 | 139 | |
| 140 | 140 | public function testMoveItemLastToFront() |
| 141 | 141 | { |
| 142 | 142 | $listItems = $this->getListItems(); |
| 143 | - $this->assertGreaterThan( 1, count( $listItems ) ); |
|
| 143 | + $this->assertGreaterThan(1, count($listItems)); |
|
| 144 | 144 | |
| 145 | - if( ( $first = reset( $listItems ) ) === false ) { |
|
| 146 | - throw new \RuntimeException( 'No first customer list item' ); |
|
| 145 | + if (($first = reset($listItems)) === false) { |
|
| 146 | + throw new \RuntimeException('No first customer list item'); |
|
| 147 | 147 | } |
| 148 | 148 | |
| 149 | - if( ( $last = end( $listItems ) ) === false ) { |
|
| 150 | - throw new \RuntimeException( 'No last customer list item' ); |
|
| 149 | + if (($last = end($listItems)) === false) { |
|
| 150 | + throw new \RuntimeException('No last customer list item'); |
|
| 151 | 151 | } |
| 152 | 152 | |
| 153 | - $this->object->moveItem( $last->getId(), $first->getId() ); |
|
| 153 | + $this->object->moveItem($last->getId(), $first->getId()); |
|
| 154 | 154 | |
| 155 | - $newFirst = $this->object->getItem( $last->getId() ); |
|
| 156 | - $newSecond = $this->object->getItem( $first->getId() ); |
|
| 155 | + $newFirst = $this->object->getItem($last->getId()); |
|
| 156 | + $newSecond = $this->object->getItem($first->getId()); |
|
| 157 | 157 | |
| 158 | - $this->object->moveItem( $last->getId() ); |
|
| 158 | + $this->object->moveItem($last->getId()); |
|
| 159 | 159 | |
| 160 | - $this->assertEquals( 1, $newFirst->getPosition() ); |
|
| 161 | - $this->assertEquals( 2, $newSecond->getPosition() ); |
|
| 160 | + $this->assertEquals(1, $newFirst->getPosition()); |
|
| 161 | + $this->assertEquals(2, $newSecond->getPosition()); |
|
| 162 | 162 | } |
| 163 | 163 | |
| 164 | 164 | |
| 165 | 165 | public function testMoveItemFirstToLast() |
| 166 | 166 | { |
| 167 | 167 | $listItems = $this->getListItems(); |
| 168 | - $this->assertGreaterThan( 1, count( $listItems ) ); |
|
| 168 | + $this->assertGreaterThan(1, count($listItems)); |
|
| 169 | 169 | |
| 170 | - if( ( $first = reset( $listItems ) ) === false ) { |
|
| 171 | - throw new \RuntimeException( 'No first customer list item' ); |
|
| 170 | + if (($first = reset($listItems)) === false) { |
|
| 171 | + throw new \RuntimeException('No first customer list item'); |
|
| 172 | 172 | } |
| 173 | 173 | |
| 174 | - if( ( $second = next( $listItems ) ) === false ) { |
|
| 175 | - throw new \RuntimeException( 'No second customer list item' ); |
|
| 174 | + if (($second = next($listItems)) === false) { |
|
| 175 | + throw new \RuntimeException('No second customer list item'); |
|
| 176 | 176 | } |
| 177 | 177 | |
| 178 | - if( ( $last = end( $listItems ) ) === false ) { |
|
| 179 | - throw new \RuntimeException( 'No last customer list item' ); |
|
| 178 | + if (($last = end($listItems)) === false) { |
|
| 179 | + throw new \RuntimeException('No last customer list item'); |
|
| 180 | 180 | } |
| 181 | 181 | |
| 182 | - $this->object->moveItem( $first->getId() ); |
|
| 182 | + $this->object->moveItem($first->getId()); |
|
| 183 | 183 | |
| 184 | - $newBefore = $this->object->getItem( $last->getId() ); |
|
| 185 | - $newLast = $this->object->getItem( $first->getId() ); |
|
| 184 | + $newBefore = $this->object->getItem($last->getId()); |
|
| 185 | + $newLast = $this->object->getItem($first->getId()); |
|
| 186 | 186 | |
| 187 | - $this->object->moveItem( $first->getId(), $second->getId() ); |
|
| 187 | + $this->object->moveItem($first->getId(), $second->getId()); |
|
| 188 | 188 | |
| 189 | - $this->assertEquals( $last->getPosition() - 1, $newBefore->getPosition() ); |
|
| 190 | - $this->assertEquals( $last->getPosition(), $newLast->getPosition() ); |
|
| 189 | + $this->assertEquals($last->getPosition() - 1, $newBefore->getPosition()); |
|
| 190 | + $this->assertEquals($last->getPosition(), $newLast->getPosition()); |
|
| 191 | 191 | } |
| 192 | 192 | |
| 193 | 193 | |
| 194 | 194 | public function testMoveItemFirstUp() |
| 195 | 195 | { |
| 196 | 196 | $listItems = $this->getListItems(); |
| 197 | - $this->assertGreaterThan( 1, count( $listItems ) ); |
|
| 197 | + $this->assertGreaterThan(1, count($listItems)); |
|
| 198 | 198 | |
| 199 | - if( ( $first = reset( $listItems ) ) === false ) { |
|
| 200 | - throw new \RuntimeException( 'No first customer list item' ); |
|
| 199 | + if (($first = reset($listItems)) === false) { |
|
| 200 | + throw new \RuntimeException('No first customer list item'); |
|
| 201 | 201 | } |
| 202 | 202 | |
| 203 | - if( ( $second = next( $listItems ) ) === false ) { |
|
| 204 | - throw new \RuntimeException( 'No second customer list item' ); |
|
| 203 | + if (($second = next($listItems)) === false) { |
|
| 204 | + throw new \RuntimeException('No second customer list item'); |
|
| 205 | 205 | } |
| 206 | 206 | |
| 207 | - if( ( $last = end( $listItems ) ) === false ) { |
|
| 208 | - throw new \RuntimeException( 'No last customer list item' ); |
|
| 207 | + if (($last = end($listItems)) === false) { |
|
| 208 | + throw new \RuntimeException('No last customer list item'); |
|
| 209 | 209 | } |
| 210 | 210 | |
| 211 | - $this->object->moveItem( $first->getId(), $last->getId() ); |
|
| 211 | + $this->object->moveItem($first->getId(), $last->getId()); |
|
| 212 | 212 | |
| 213 | - $newLast = $this->object->getItem( $last->getId() ); |
|
| 214 | - $newUp = $this->object->getItem( $first->getId() ); |
|
| 213 | + $newLast = $this->object->getItem($last->getId()); |
|
| 214 | + $newUp = $this->object->getItem($first->getId()); |
|
| 215 | 215 | |
| 216 | - $this->object->moveItem( $first->getId(), $second->getId() ); |
|
| 216 | + $this->object->moveItem($first->getId(), $second->getId()); |
|
| 217 | 217 | |
| 218 | - $this->assertEquals( $last->getPosition() - 1, $newUp->getPosition() ); |
|
| 219 | - $this->assertEquals( $last->getPosition(), $newLast->getPosition() ); |
|
| 218 | + $this->assertEquals($last->getPosition() - 1, $newUp->getPosition()); |
|
| 219 | + $this->assertEquals($last->getPosition(), $newLast->getPosition()); |
|
| 220 | 220 | } |
| 221 | 221 | |
| 222 | 222 | |
@@ -226,39 +226,39 @@ discard block |
||
| 226 | 226 | $search = $this->object->createSearch(); |
| 227 | 227 | |
| 228 | 228 | $expr = []; |
| 229 | - $expr[] = $search->compare( '!=', 'customer.lists.id', null ); |
|
| 230 | - $expr[] = $search->compare( '!=', 'customer.lists.siteid', null ); |
|
| 231 | - $expr[] = $search->compare( '>', 'customer.lists.parentid', 0 ); |
|
| 232 | - $expr[] = $search->compare( '==', 'customer.lists.domain', 'text' ); |
|
| 233 | - $expr[] = $search->compare( '>', 'customer.lists.typeid', 0 ); |
|
| 234 | - $expr[] = $search->compare( '>', 'customer.lists.refid', 0 ); |
|
| 235 | - $expr[] = $search->compare( '==', 'customer.lists.datestart', '2010-01-01 00:00:00' ); |
|
| 236 | - $expr[] = $search->compare( '==', 'customer.lists.dateend', '2100-01-01 00:00:00' ); |
|
| 237 | - $expr[] = $search->compare( '!=', 'customer.lists.config', null ); |
|
| 238 | - $expr[] = $search->compare( '>', 'customer.lists.position', 1 ); |
|
| 239 | - $expr[] = $search->compare( '==', 'customer.lists.status', 1 ); |
|
| 240 | - $expr[] = $search->compare( '>=', 'customer.lists.mtime', '1970-01-01 00:00:00' ); |
|
| 241 | - $expr[] = $search->compare( '>=', 'customer.lists.ctime', '1970-01-01 00:00:00' ); |
|
| 242 | - $expr[] = $search->compare( '==', 'customer.lists.editor', $this->editor ); |
|
| 243 | - |
|
| 244 | - $expr[] = $search->compare( '!=', 'customer.lists.type.id', 0 ); |
|
| 245 | - $expr[] = $search->compare( '!=', 'customer.lists.type.siteid', null ); |
|
| 246 | - $expr[] = $search->compare( '==', 'customer.lists.type.code', 'default' ); |
|
| 247 | - $expr[] = $search->compare( '==', 'customer.lists.type.domain', 'text' ); |
|
| 248 | - $expr[] = $search->compare( '==', 'customer.lists.type.label', 'Standard' ); |
|
| 249 | - $expr[] = $search->compare( '==', 'customer.lists.type.status', 1 ); |
|
| 250 | - $expr[] = $search->compare( '>=', 'customer.lists.type.mtime', '1970-01-01 00:00:00' ); |
|
| 251 | - $expr[] = $search->compare( '>=', 'customer.lists.type.ctime', '1970-01-01 00:00:00' ); |
|
| 252 | - $expr[] = $search->compare( '==', 'customer.lists.type.editor', $this->editor ); |
|
| 253 | - |
|
| 254 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
| 229 | + $expr[] = $search->compare('!=', 'customer.lists.id', null); |
|
| 230 | + $expr[] = $search->compare('!=', 'customer.lists.siteid', null); |
|
| 231 | + $expr[] = $search->compare('>', 'customer.lists.parentid', 0); |
|
| 232 | + $expr[] = $search->compare('==', 'customer.lists.domain', 'text'); |
|
| 233 | + $expr[] = $search->compare('>', 'customer.lists.typeid', 0); |
|
| 234 | + $expr[] = $search->compare('>', 'customer.lists.refid', 0); |
|
| 235 | + $expr[] = $search->compare('==', 'customer.lists.datestart', '2010-01-01 00:00:00'); |
|
| 236 | + $expr[] = $search->compare('==', 'customer.lists.dateend', '2100-01-01 00:00:00'); |
|
| 237 | + $expr[] = $search->compare('!=', 'customer.lists.config', null); |
|
| 238 | + $expr[] = $search->compare('>', 'customer.lists.position', 1); |
|
| 239 | + $expr[] = $search->compare('==', 'customer.lists.status', 1); |
|
| 240 | + $expr[] = $search->compare('>=', 'customer.lists.mtime', '1970-01-01 00:00:00'); |
|
| 241 | + $expr[] = $search->compare('>=', 'customer.lists.ctime', '1970-01-01 00:00:00'); |
|
| 242 | + $expr[] = $search->compare('==', 'customer.lists.editor', $this->editor); |
|
| 243 | + |
|
| 244 | + $expr[] = $search->compare('!=', 'customer.lists.type.id', 0); |
|
| 245 | + $expr[] = $search->compare('!=', 'customer.lists.type.siteid', null); |
|
| 246 | + $expr[] = $search->compare('==', 'customer.lists.type.code', 'default'); |
|
| 247 | + $expr[] = $search->compare('==', 'customer.lists.type.domain', 'text'); |
|
| 248 | + $expr[] = $search->compare('==', 'customer.lists.type.label', 'Standard'); |
|
| 249 | + $expr[] = $search->compare('==', 'customer.lists.type.status', 1); |
|
| 250 | + $expr[] = $search->compare('>=', 'customer.lists.type.mtime', '1970-01-01 00:00:00'); |
|
| 251 | + $expr[] = $search->compare('>=', 'customer.lists.type.ctime', '1970-01-01 00:00:00'); |
|
| 252 | + $expr[] = $search->compare('==', 'customer.lists.type.editor', $this->editor); |
|
| 253 | + |
|
| 254 | + $search->setConditions($search->combine('&&', $expr)); |
|
| 255 | 255 | $search->setSlice(0, 1); |
| 256 | - $results = $this->object->searchItems( $search, [], $total ); |
|
| 257 | - $this->assertEquals( 1, count( $results ) ); |
|
| 258 | - $this->assertEquals( 2, $total ); |
|
| 256 | + $results = $this->object->searchItems($search, [], $total); |
|
| 257 | + $this->assertEquals(1, count($results)); |
|
| 258 | + $this->assertEquals(2, $total); |
|
| 259 | 259 | |
| 260 | - foreach($results as $itemId => $item) { |
|
| 261 | - $this->assertEquals( $itemId, $item->getId() ); |
|
| 260 | + foreach ($results as $itemId => $item) { |
|
| 261 | + $this->assertEquals($itemId, $item->getId()); |
|
| 262 | 262 | } |
| 263 | 263 | } |
| 264 | 264 | |
@@ -266,8 +266,8 @@ discard block |
||
| 266 | 266 | public function testSearchItemsNoCriteria() |
| 267 | 267 | { |
| 268 | 268 | $search = $this->object->createSearch(); |
| 269 | - $search->setConditions( $search->compare( '==', 'customer.lists.editor', $this->editor ) ); |
|
| 270 | - $this->assertEquals( 4, count( $this->object->searchItems($search) ) ); |
|
| 269 | + $search->setConditions($search->compare('==', 'customer.lists.editor', $this->editor)); |
|
| 270 | + $this->assertEquals(4, count($this->object->searchItems($search))); |
|
| 271 | 271 | } |
| 272 | 272 | |
| 273 | 273 | |
@@ -275,48 +275,48 @@ discard block |
||
| 275 | 275 | { |
| 276 | 276 | $search = $this->object->createSearch(true); |
| 277 | 277 | $conditions = array( |
| 278 | - $search->compare( '==', 'customer.lists.editor', $this->editor ), |
|
| 278 | + $search->compare('==', 'customer.lists.editor', $this->editor), |
|
| 279 | 279 | $search->getConditions() |
| 280 | 280 | ); |
| 281 | - $search->setConditions( $search->combine( '&&', $conditions ) ); |
|
| 282 | - $this->assertEquals( 4, count( $this->object->searchItems($search) ) ); |
|
| 281 | + $search->setConditions($search->combine('&&', $conditions)); |
|
| 282 | + $this->assertEquals(4, count($this->object->searchItems($search))); |
|
| 283 | 283 | } |
| 284 | 284 | |
| 285 | 285 | |
| 286 | 286 | public function testGetSubManager() |
| 287 | 287 | { |
| 288 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('type') ); |
|
| 289 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('type', 'Standard') ); |
|
| 288 | + $this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('type')); |
|
| 289 | + $this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('type', 'Standard')); |
|
| 290 | 290 | |
| 291 | - $this->setExpectedException( '\\Aimeos\\MShop\\Exception' ); |
|
| 292 | - $this->object->getSubManager( 'unknown' ); |
|
| 291 | + $this->setExpectedException('\\Aimeos\\MShop\\Exception'); |
|
| 292 | + $this->object->getSubManager('unknown'); |
|
| 293 | 293 | } |
| 294 | 294 | |
| 295 | 295 | |
| 296 | 296 | protected function getListItems() |
| 297 | 297 | { |
| 298 | - $manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $this->context, 'FosUser' ); |
|
| 298 | + $manager = \Aimeos\MShop\Customer\Manager\Factory::createManager($this->context, 'FosUser'); |
|
| 299 | 299 | |
| 300 | 300 | $search = $manager->createSearch(); |
| 301 | - $search->setConditions( $search->compare( '==', 'customer.code', 'UTC003' ) ); |
|
| 302 | - $search->setSlice( 0, 1 ); |
|
| 301 | + $search->setConditions($search->compare('==', 'customer.code', 'UTC003')); |
|
| 302 | + $search->setSlice(0, 1); |
|
| 303 | 303 | |
| 304 | - $results = $manager->searchItems( $search ); |
|
| 304 | + $results = $manager->searchItems($search); |
|
| 305 | 305 | |
| 306 | - if( ( $item = reset( $results ) ) === false ) { |
|
| 307 | - throw new \RuntimeException( 'No customer item found' ); |
|
| 306 | + if (($item = reset($results)) === false) { |
|
| 307 | + throw new \RuntimeException('No customer item found'); |
|
| 308 | 308 | } |
| 309 | 309 | |
| 310 | 310 | $search = $this->object->createSearch(); |
| 311 | 311 | $expr = array( |
| 312 | - $search->compare( '==', 'customer.lists.parentid', $item->getId() ), |
|
| 313 | - $search->compare( '==', 'customer.lists.domain', 'text' ), |
|
| 314 | - $search->compare( '==', 'customer.lists.editor', $this->editor ), |
|
| 315 | - $search->compare( '==', 'customer.lists.type.code', 'default' ), |
|
| 312 | + $search->compare('==', 'customer.lists.parentid', $item->getId()), |
|
| 313 | + $search->compare('==', 'customer.lists.domain', 'text'), |
|
| 314 | + $search->compare('==', 'customer.lists.editor', $this->editor), |
|
| 315 | + $search->compare('==', 'customer.lists.type.code', 'default'), |
|
| 316 | 316 | ); |
| 317 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
| 318 | - $search->setSortations( array( $search->sort( '+', 'customer.lists.position' ) ) ); |
|
| 317 | + $search->setConditions($search->combine('&&', $expr)); |
|
| 318 | + $search->setSortations(array($search->sort('+', 'customer.lists.position'))); |
|
| 319 | 319 | |
| 320 | - return $this->object->searchItems( $search ); |
|
| 320 | + return $this->object->searchItems($search); |
|
| 321 | 321 | } |
| 322 | 322 | } |