@@ -116,7 +116,7 @@ |
||
116 | 116 | * |
117 | 117 | * @param string|null $domain Name of the domain (e.g. product, text, etc.) or null for all |
118 | 118 | * @param array|string|null $type Name/Names of the item type or null for all |
119 | - * @param array|string|null $listtype Name/Names of the list item type or null for all |
|
119 | + * @param string $listtype Name/Names of the list item type or null for all |
|
120 | 120 | * @return array List of items implementing \Aimeos\MShop\Common\Item\Iface |
121 | 121 | */ |
122 | 122 | public function getRefItems( $domain = null, $type = null, $listtype = null ) |
@@ -695,6 +695,7 @@ |
||
695 | 695 | * @param string $path Configuration path to the sub-domains |
696 | 696 | * @param array $default List of sub-domains if no others are configured |
697 | 697 | * @param boolean $withsub Return also the resource type of sub-managers if true |
698 | + * @param string $type |
|
698 | 699 | * @return array Type of the manager and submanagers, subtypes are separated by slashes |
699 | 700 | */ |
700 | 701 | protected function getResourceTypeBase( $type, $path, array $default, $withsub ) |
@@ -668,8 +668,7 @@ |
||
668 | 668 | |
669 | 669 | if( isset( $attributes[$name] ) && $attributes[$name] instanceof $iface ) { |
670 | 670 | return $attributes[$name]->getInternalDeps(); |
671 | - } |
|
672 | - else if( isset( $attributes['id'] ) && $attributes['id'] instanceof $iface ) { |
|
671 | + } else if( isset( $attributes['id'] ) && $attributes['id'] instanceof $iface ) { |
|
673 | 672 | return $attributes['id']->getInternalDeps(); |
674 | 673 | } |
675 | 674 |
@@ -256,7 +256,7 @@ discard block |
||
256 | 256 | $conn = $dbm->acquire( $dbname ); |
257 | 257 | |
258 | 258 | $object = new \Aimeos\MW\Criteria\SQL( $conn ); |
259 | - $object->setConditions( $object->compare( '==', $domain . '.status', 1 ) ); |
|
259 | + $object->setConditions( $object->compare( '==', $domain.'.status', 1 ) ); |
|
260 | 260 | |
261 | 261 | $dbm->release( $conn, $dbname ); |
262 | 262 | |
@@ -359,9 +359,9 @@ discard block |
||
359 | 359 | protected function getSqlConfig( $path ) |
360 | 360 | { |
361 | 361 | $config = $this->getContext()->getConfig(); |
362 | - $adapter = $config->get( 'resource/' . $this->getResourceName() . '/adapter' ); |
|
362 | + $adapter = $config->get( 'resource/'.$this->getResourceName().'/adapter' ); |
|
363 | 363 | |
364 | - return $config->get( $path . '/' . $adapter, $config->get( $path . '/ansi', $path ) ); |
|
364 | + return $config->get( $path.'/'.$adapter, $config->get( $path.'/ansi', $path ) ); |
|
365 | 365 | } |
366 | 366 | |
367 | 367 | |
@@ -377,7 +377,7 @@ discard block |
||
377 | 377 | { |
378 | 378 | $domain = strtolower( $domain ); |
379 | 379 | $manager = strtolower( $manager ); |
380 | - $key = $domain . $manager . $name; |
|
380 | + $key = $domain.$manager.$name; |
|
381 | 381 | |
382 | 382 | if( !isset( $this->subManagers[$key] ) ) |
383 | 383 | { |
@@ -390,7 +390,7 @@ discard block |
||
390 | 390 | } |
391 | 391 | |
392 | 392 | if( $name === null ) { |
393 | - $path = 'mshop/' . $domain . '/manager/' . $manager . '/name'; |
|
393 | + $path = 'mshop/'.$domain.'/manager/'.$manager.'/name'; |
|
394 | 394 | $name = $this->context->getConfig()->get( $path, 'Standard' ); |
395 | 395 | } |
396 | 396 | |
@@ -401,8 +401,8 @@ discard block |
||
401 | 401 | $domainname = ucfirst( $domain ); |
402 | 402 | $subnames = $this->createSubNames( $manager ); |
403 | 403 | |
404 | - $classname = '\\Aimeos\\MShop\\' . $domainname . '\\Manager\\' . $subnames . '\\' . $name; |
|
405 | - $interface = '\\Aimeos\\MShop\\' . $domainname . '\\Manager\\' . $subnames . '\\Iface'; |
|
404 | + $classname = '\\Aimeos\\MShop\\'.$domainname.'\\Manager\\'.$subnames.'\\'.$name; |
|
405 | + $interface = '\\Aimeos\\MShop\\'.$domainname.'\\Manager\\'.$subnames.'\\Iface'; |
|
406 | 406 | |
407 | 407 | if( class_exists( $classname ) === false ) { |
408 | 408 | throw new \Aimeos\MShop\Exception( sprintf( 'Class "%1$s" not available', $classname ) ); |
@@ -441,7 +441,7 @@ discard block |
||
441 | 441 | throw new \Aimeos\MShop\Exception( sprintf( 'Invalid characters in class name "%1$s"', $name ) ); |
442 | 442 | } |
443 | 443 | |
444 | - $classname = $classprefix . $name; |
|
444 | + $classname = $classprefix.$name; |
|
445 | 445 | |
446 | 446 | if( class_exists( $classname ) === false ) { |
447 | 447 | throw new \Aimeos\MShop\Exception( sprintf( 'Class "%1$s" not available', $classname ) ); |
@@ -470,7 +470,7 @@ discard block |
||
470 | 470 | $config = $this->context->getConfig(); |
471 | 471 | |
472 | 472 | $decorators = $config->get( 'mshop/common/manager/decorators/default', [] ); |
473 | - $excludes = $config->get( 'mshop/' . $domain . '/manager/' . $managerpath . '/decorators/excludes', [] ); |
|
473 | + $excludes = $config->get( 'mshop/'.$domain.'/manager/'.$managerpath.'/decorators/excludes', [] ); |
|
474 | 474 | |
475 | 475 | foreach( $decorators as $key => $name ) |
476 | 476 | { |
@@ -483,12 +483,12 @@ discard block |
||
483 | 483 | $manager = $this->addDecorators( $this->context, $manager, $decorators, $classprefix ); |
484 | 484 | |
485 | 485 | $classprefix = '\\Aimeos\\MShop\\Common\\Manager\\Decorator\\'; |
486 | - $decorators = $config->get( 'mshop/' . $domain . '/manager/' . $managerpath . '/decorators/global', [] ); |
|
486 | + $decorators = $config->get( 'mshop/'.$domain.'/manager/'.$managerpath.'/decorators/global', [] ); |
|
487 | 487 | $manager = $this->addDecorators( $this->context, $manager, $decorators, $classprefix ); |
488 | 488 | |
489 | 489 | $subpath = $this->createSubNames( $managerpath ); |
490 | - $classprefix = 'MShop_' . ucfirst( $domain ) . '_Manager_' . $subpath . '_Decorator_'; |
|
491 | - $decorators = $config->get( 'mshop/' . $domain . '/manager/' . $managerpath . '/decorators/local', [] ); |
|
490 | + $classprefix = 'MShop_'.ucfirst( $domain ).'_Manager_'.$subpath.'_Decorator_'; |
|
491 | + $decorators = $config->get( 'mshop/'.$domain.'/manager/'.$managerpath.'/decorators/local', [] ); |
|
492 | 492 | |
493 | 493 | return $this->addDecorators( $this->context, $manager, $decorators, $classprefix ); |
494 | 494 | } |
@@ -614,7 +614,7 @@ discard block |
||
614 | 614 | { |
615 | 615 | $iface = '\\Aimeos\\MW\\Criteria\\Attribute\\Iface'; |
616 | 616 | $sep = $this->getKeySeparator(); |
617 | - $name = $prefix . $sep . 'id'; |
|
617 | + $name = $prefix.$sep.'id'; |
|
618 | 618 | |
619 | 619 | if( isset( $attributes[$name] ) && $attributes[$name] instanceof $iface ) { |
620 | 620 | return $attributes[$name]->getInternalDeps(); |
@@ -672,7 +672,7 @@ discard block |
||
672 | 672 | { |
673 | 673 | $config = $this->context->getConfig(); |
674 | 674 | |
675 | - if( $config->get( 'resource/' . $name ) === null ) { |
|
675 | + if( $config->get( 'resource/'.$name ) === null ) { |
|
676 | 676 | $this->resourceName = $config->get( 'resource/default', 'db' ); |
677 | 677 | } else { |
678 | 678 | $this->resourceName = $name; |
@@ -742,7 +742,7 @@ discard block |
||
742 | 742 | |
743 | 743 | foreach( $keys as $key ) |
744 | 744 | { |
745 | - $name = $key . $sep . 'siteid'; |
|
745 | + $name = $key.$sep.'siteid'; |
|
746 | 746 | |
747 | 747 | if( isset( $attributes[$name] ) ) { |
748 | 748 | $cond[] = $search->compare( '==', $name, $siteIds ); |
@@ -830,7 +830,7 @@ discard block |
||
830 | 830 | $row = $results->fetch(); |
831 | 831 | $results->finish(); |
832 | 832 | |
833 | - $msg = get_class( $this ) . ' (' . ( ( microtime( true ) - $time ) * 1000 ) . 'ms): SQL = ' . $stmt; |
|
833 | + $msg = get_class( $this ).' ('.( ( microtime( true ) - $time ) * 1000 ).'ms): SQL = '.$stmt; |
|
834 | 834 | $this->context->getLogger()->log( $msg, \Aimeos\MW\Logger\Base::DEBUG, 'core/sql' ); |
835 | 835 | |
836 | 836 | if( $row === false ) { |
@@ -848,7 +848,7 @@ discard block |
||
848 | 848 | $stmt = $conn->create( $sql->str() ); |
849 | 849 | $results = $stmt->execute(); |
850 | 850 | |
851 | - $msg = get_class( $this ) . ' (' . ( ( microtime( true ) - $time ) * 1000 ) . 'ms): SQL = ' . $stmt; |
|
851 | + $msg = get_class( $this ).' ('.( ( microtime( true ) - $time ) * 1000 ).'ms): SQL = '.$stmt; |
|
852 | 852 | $this->context->getLogger()->log( $msg, \Aimeos\MW\Logger\Base::DEBUG, 'core/sql' ); |
853 | 853 | |
854 | 854 | return $results; |
@@ -874,7 +874,7 @@ discard block |
||
874 | 874 | $search->setConditions( $search->compare( '==', $name, $ids ) ); |
875 | 875 | |
876 | 876 | $types = array( $name => \Aimeos\MW\DB\Statement\Base::PARAM_STR ); |
877 | - $translations = array( $name => '"' . $name . '"' ); |
|
877 | + $translations = array( $name => '"'.$name.'"' ); |
|
878 | 878 | |
879 | 879 | $cond = $search->getConditionString( $types, $translations ); |
880 | 880 | $sql = str_replace( ':cond', $cond, $this->getSqlConfig( $cfgpath ) ); |
@@ -136,8 +136,7 @@ |
||
136 | 136 | $subList = self::createControllers( $it, $context, $aimeos, $pref ); |
137 | 137 | |
138 | 138 | $list = array_merge( $list, $subList ); |
139 | - } |
|
140 | - else if( $prefix !== '' && $entry->getType() === 'file' |
|
139 | + } else if( $prefix !== '' && $entry->getType() === 'file' |
|
141 | 140 | && ( $name = $entry->getBaseName( '.php' ) ) === 'Factory' ) |
142 | 141 | { |
143 | 142 | $list[$prefix] = self::createController( $context, $aimeos, $prefix ); |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | $parts[$key] = ucwords( $part ); |
57 | 57 | } |
58 | 58 | |
59 | - $factory = '\\Aimeos\\Controller\\Jobs\\' . join( '\\', $parts ) . '\\Factory'; |
|
59 | + $factory = '\\Aimeos\\Controller\\Jobs\\'.join( '\\', $parts ).'\\Factory'; |
|
60 | 60 | |
61 | 61 | if( class_exists( $factory ) === false ) { |
62 | 62 | throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Class "%1$s" not found', $factory ) ); |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | $cntlList = []; |
87 | 87 | $subFolder = trim( str_replace( '\\', '/', self::$prefix ), '/' ); |
88 | 88 | |
89 | - if( strncmp( $subFolder, 'Aimeos' . '/', 7 ) === 0 ) { |
|
89 | + if( strncmp( $subFolder, 'Aimeos'.'/', 7 ) === 0 ) { |
|
90 | 90 | $subFolder = substr( $subFolder, 7 ); |
91 | 91 | } |
92 | 92 | |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | { |
95 | 95 | foreach( $list as $relpath ) |
96 | 96 | { |
97 | - $path .= DIRECTORY_SEPARATOR . str_replace( '/', DIRECTORY_SEPARATOR, $relpath . '/' . $subFolder ); |
|
97 | + $path .= DIRECTORY_SEPARATOR.str_replace( '/', DIRECTORY_SEPARATOR, $relpath.'/'.$subFolder ); |
|
98 | 98 | |
99 | 99 | if( is_dir( $path ) ) |
100 | 100 | { |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | { |
133 | 133 | $name = strtolower( $entry->getBaseName() ); |
134 | 134 | $it = new \DirectoryIterator( $entry->getPathName() ); |
135 | - $pref = ( $prefix !== '' ? $prefix . '/' : '' ) . $name; |
|
135 | + $pref = ( $prefix !== '' ? $prefix.'/' : '' ).$name; |
|
136 | 136 | $subList = self::createControllers( $it, $context, $aimeos, $pref ); |
137 | 137 | |
138 | 138 | $list = array_merge( $list, $subList ); |
@@ -72,8 +72,7 @@ |
||
72 | 72 | { |
73 | 73 | $this->executeList( $stmts ); |
74 | 74 | $this->status( 'migrated' ); |
75 | - } |
|
76 | - else |
|
75 | + } else |
|
77 | 76 | { |
78 | 77 | $this->status( 'OK' ); |
79 | 78 | } |
@@ -65,8 +65,7 @@ |
||
65 | 65 | { |
66 | 66 | $this->executeList( $stmts ); |
67 | 67 | $this->status( 'added' ); |
68 | - } |
|
69 | - else |
|
68 | + } else |
|
70 | 69 | { |
71 | 70 | $this->status( 'OK' ); |
72 | 71 | } |
@@ -71,8 +71,7 @@ |
||
71 | 71 | { |
72 | 72 | $this->execute( $stmt ); |
73 | 73 | $this->status( 'done' ); |
74 | - } |
|
75 | - else |
|
74 | + } else |
|
76 | 75 | { |
77 | 76 | $this->status( 'OK' ); |
78 | 77 | } |
@@ -90,8 +90,7 @@ |
||
90 | 90 | $this->executeList( $stmts['drop'] ); |
91 | 91 | |
92 | 92 | $this->status( sprintf( 'migrated (%1$d)', $count ) ); |
93 | - } |
|
94 | - else |
|
93 | + } else |
|
95 | 94 | { |
96 | 95 | $this->status( 'OK' ); |
97 | 96 | } |
@@ -172,8 +172,7 @@ |
||
172 | 172 | { |
173 | 173 | $this->executeList( $stmtList ); |
174 | 174 | $this->status( 'migrated' ); |
175 | - } |
|
176 | - else |
|
175 | + } else |
|
177 | 176 | { |
178 | 177 | $this->status( 'OK' ); |
179 | 178 | } |
@@ -90,8 +90,7 @@ |
||
90 | 90 | { |
91 | 91 | $this->executeList( $stmts, 'db-coupon' ); |
92 | 92 | $this->status( 'done' ); |
93 | - } |
|
94 | - else |
|
93 | + } else |
|
95 | 94 | { |
96 | 95 | $this->status( 'OK' ); |
97 | 96 | } |