@@ -15,15 +15,15 @@ discard block |
||
| 15 | 15 | public static function bootstrap() |
| 16 | 16 | { |
| 17 | 17 | self::getAimeos(); |
| 18 | - \Aimeos\MShop\Factory::setCache( false ); |
|
| 19 | - \Aimeos\Admin\JsonAdm\Factory::setCache( false ); |
|
| 18 | + \Aimeos\MShop\Factory::setCache(false); |
|
| 19 | + \Aimeos\Admin\JsonAdm\Factory::setCache(false); |
|
| 20 | 20 | } |
| 21 | 21 | |
| 22 | 22 | |
| 23 | - public static function getContext( $site = 'unittest' ) |
|
| 23 | + public static function getContext($site = 'unittest') |
|
| 24 | 24 | { |
| 25 | - if( !isset( self::$context[$site] ) ) { |
|
| 26 | - self::$context[$site] = self::createContext( $site ); |
|
| 25 | + if (!isset(self::$context[$site])) { |
|
| 26 | + self::$context[$site] = self::createContext($site); |
|
| 27 | 27 | } |
| 28 | 28 | |
| 29 | 29 | return clone self::$context[$site]; |
@@ -32,13 +32,13 @@ discard block |
||
| 32 | 32 | |
| 33 | 33 | public static function getAimeos() |
| 34 | 34 | { |
| 35 | - if( !isset( self::$aimeos ) ) |
|
| 35 | + if (!isset(self::$aimeos)) |
|
| 36 | 36 | { |
| 37 | 37 | require_once 'Bootstrap.php'; |
| 38 | - spl_autoload_register( 'Aimeos\\Bootstrap::autoload' ); |
|
| 38 | + spl_autoload_register('Aimeos\\Bootstrap::autoload'); |
|
| 39 | 39 | |
| 40 | - $extdir = dirname( dirname( dirname( dirname( __FILE__ ) ) ) ); |
|
| 41 | - self::$aimeos = new \Aimeos\Bootstrap( array( $extdir ), false ); |
|
| 40 | + $extdir = dirname(dirname(dirname(dirname(__FILE__)))); |
|
| 41 | + self::$aimeos = new \Aimeos\Bootstrap(array($extdir), false); |
|
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | return self::$aimeos; |
@@ -47,85 +47,85 @@ discard block |
||
| 47 | 47 | |
| 48 | 48 | public static function getJsonadmPaths() |
| 49 | 49 | { |
| 50 | - return self::getAimeos()->getCustomPaths( 'admin/jsonadm/templates' ); |
|
| 50 | + return self::getAimeos()->getCustomPaths('admin/jsonadm/templates'); |
|
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | |
| 54 | - private static function createContext( $site ) |
|
| 54 | + private static function createContext($site) |
|
| 55 | 55 | { |
| 56 | 56 | $ctx = new \Aimeos\MShop\Context\Item\Standard(); |
| 57 | 57 | $aimeos = self::getAimeos(); |
| 58 | 58 | |
| 59 | 59 | |
| 60 | - $paths = $aimeos->getConfigPaths( 'mysql' ); |
|
| 60 | + $paths = $aimeos->getConfigPaths('mysql'); |
|
| 61 | 61 | $paths[] = __DIR__ . DIRECTORY_SEPARATOR . 'config'; |
| 62 | 62 | $file = __DIR__ . DIRECTORY_SEPARATOR . 'confdoc.ser'; |
| 63 | 63 | |
| 64 | - $conf = new \Aimeos\MW\Config\PHPArray( [], $paths ); |
|
| 65 | - $conf = new \Aimeos\MW\Config\Decorator\Memory( $conf ); |
|
| 66 | - $conf = new \Aimeos\MW\Config\Decorator\Documentor( $conf, $file ); |
|
| 67 | - $ctx->setConfig( $conf ); |
|
| 64 | + $conf = new \Aimeos\MW\Config\PHPArray([], $paths); |
|
| 65 | + $conf = new \Aimeos\MW\Config\Decorator\Memory($conf); |
|
| 66 | + $conf = new \Aimeos\MW\Config\Decorator\Documentor($conf, $file); |
|
| 67 | + $ctx->setConfig($conf); |
|
| 68 | 68 | |
| 69 | 69 | |
| 70 | - $dbm = new \Aimeos\MW\DB\Manager\PDO( $conf ); |
|
| 71 | - $ctx->setDatabaseManager( $dbm ); |
|
| 70 | + $dbm = new \Aimeos\MW\DB\Manager\PDO($conf); |
|
| 71 | + $ctx->setDatabaseManager($dbm); |
|
| 72 | 72 | |
| 73 | 73 | |
| 74 | - $logger = new \Aimeos\MW\Logger\File( $site . '.log', \Aimeos\MW\Logger\Base::DEBUG ); |
|
| 75 | - $ctx->setLogger( $logger ); |
|
| 74 | + $logger = new \Aimeos\MW\Logger\File($site . '.log', \Aimeos\MW\Logger\Base::DEBUG); |
|
| 75 | + $ctx->setLogger($logger); |
|
| 76 | 76 | |
| 77 | 77 | |
| 78 | 78 | $session = new \Aimeos\MW\Session\None(); |
| 79 | - $ctx->setSession( $session ); |
|
| 79 | + $ctx->setSession($session); |
|
| 80 | 80 | |
| 81 | 81 | |
| 82 | - $i18n = new \Aimeos\MW\Translation\None( 'de' ); |
|
| 83 | - $ctx->setI18n( array( 'de' => $i18n ) ); |
|
| 82 | + $i18n = new \Aimeos\MW\Translation\None('de'); |
|
| 83 | + $ctx->setI18n(array('de' => $i18n)); |
|
| 84 | 84 | |
| 85 | 85 | |
| 86 | - $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $ctx ); |
|
| 87 | - $locale = $localeManager->bootstrap( $site, 'de', '', false ); |
|
| 88 | - $ctx->setLocale( $locale ); |
|
| 86 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($ctx); |
|
| 87 | + $locale = $localeManager->bootstrap($site, 'de', '', false); |
|
| 88 | + $ctx->setLocale($locale); |
|
| 89 | 89 | |
| 90 | 90 | |
| 91 | - $view = self::createView( $conf ); |
|
| 92 | - $ctx->setView( $view ); |
|
| 91 | + $view = self::createView($conf); |
|
| 92 | + $ctx->setView($view); |
|
| 93 | 93 | |
| 94 | 94 | |
| 95 | - $ctx->setEditor( 'core:admin/jsonadm' ); |
|
| 95 | + $ctx->setEditor('core:admin/jsonadm'); |
|
| 96 | 96 | |
| 97 | 97 | return $ctx; |
| 98 | 98 | } |
| 99 | 99 | |
| 100 | 100 | |
| 101 | - protected static function createView( \Aimeos\MW\Config\Iface $config ) |
|
| 101 | + protected static function createView(\Aimeos\MW\Config\Iface $config) |
|
| 102 | 102 | { |
| 103 | - $tmplpaths = self::getAimeos()->getCustomPaths( 'admin/jsonadm/templates' ); |
|
| 103 | + $tmplpaths = self::getAimeos()->getCustomPaths('admin/jsonadm/templates'); |
|
| 104 | 104 | |
| 105 | - $view = new \Aimeos\MW\View\Standard( $tmplpaths ); |
|
| 105 | + $view = new \Aimeos\MW\View\Standard($tmplpaths); |
|
| 106 | 106 | |
| 107 | - $trans = new \Aimeos\MW\Translation\None( 'de_DE' ); |
|
| 108 | - $helper = new \Aimeos\MW\View\Helper\Translate\Standard( $view, $trans ); |
|
| 109 | - $view->addHelper( 'translate', $helper ); |
|
| 107 | + $trans = new \Aimeos\MW\Translation\None('de_DE'); |
|
| 108 | + $helper = new \Aimeos\MW\View\Helper\Translate\Standard($view, $trans); |
|
| 109 | + $view->addHelper('translate', $helper); |
|
| 110 | 110 | |
| 111 | - $helper = new \Aimeos\MW\View\Helper\Url\Standard( $view, 'http://baseurl' ); |
|
| 112 | - $view->addHelper( 'url', $helper ); |
|
| 111 | + $helper = new \Aimeos\MW\View\Helper\Url\Standard($view, 'http://baseurl'); |
|
| 112 | + $view->addHelper('url', $helper); |
|
| 113 | 113 | |
| 114 | - $helper = new \Aimeos\MW\View\Helper\Number\Standard( $view, '.', '' ); |
|
| 115 | - $view->addHelper( 'number', $helper ); |
|
| 114 | + $helper = new \Aimeos\MW\View\Helper\Number\Standard($view, '.', ''); |
|
| 115 | + $view->addHelper('number', $helper); |
|
| 116 | 116 | |
| 117 | - $helper = new \Aimeos\MW\View\Helper\Date\Standard( $view, 'Y-m-d' ); |
|
| 118 | - $view->addHelper( 'date', $helper ); |
|
| 117 | + $helper = new \Aimeos\MW\View\Helper\Date\Standard($view, 'Y-m-d'); |
|
| 118 | + $view->addHelper('date', $helper); |
|
| 119 | 119 | |
| 120 | - $config = new \Aimeos\MW\Config\Decorator\Protect( $config, array( 'admin/jsonadm' ) ); |
|
| 121 | - $helper = new \Aimeos\MW\View\Helper\Config\Standard( $view, $config ); |
|
| 122 | - $view->addHelper( 'config', $helper ); |
|
| 120 | + $config = new \Aimeos\MW\Config\Decorator\Protect($config, array('admin/jsonadm')); |
|
| 121 | + $helper = new \Aimeos\MW\View\Helper\Config\Standard($view, $config); |
|
| 122 | + $view->addHelper('config', $helper); |
|
| 123 | 123 | |
| 124 | - $helper = new \Aimeos\MW\View\Helper\Request\Standard( $view, new \Zend\Diactoros\ServerRequest() ); |
|
| 125 | - $view->addHelper( 'request', $helper ); |
|
| 124 | + $helper = new \Aimeos\MW\View\Helper\Request\Standard($view, new \Zend\Diactoros\ServerRequest()); |
|
| 125 | + $view->addHelper('request', $helper); |
|
| 126 | 126 | |
| 127 | - $helper = new \Aimeos\MW\View\Helper\Response\Standard( $view, new \Zend\Diactoros\Response() ); |
|
| 128 | - $view->addHelper( 'response', $helper ); |
|
| 127 | + $helper = new \Aimeos\MW\View\Helper\Response\Standard($view, new \Zend\Diactoros\Response()); |
|
| 128 | + $view->addHelper('response', $helper); |
|
| 129 | 129 | |
| 130 | 130 | return $view; |
| 131 | 131 | } |
@@ -21,88 +21,88 @@ |
||
| 21 | 21 | $context = \TestHelperJadm::getContext(); |
| 22 | 22 | $this->view = $context->getView(); |
| 23 | 23 | |
| 24 | - $this->stub = $this->getMockBuilder( '\\Aimeos\\Admin\\JsonAdm\\Standard' ) |
|
| 25 | - ->setConstructorArgs( array( $context, $this->view, [], 'attribute' ) ) |
|
| 24 | + $this->stub = $this->getMockBuilder('\\Aimeos\\Admin\\JsonAdm\\Standard') |
|
| 25 | + ->setConstructorArgs(array($context, $this->view, [], 'attribute')) |
|
| 26 | 26 | ->getMock(); |
| 27 | 27 | |
| 28 | - $this->object = $this->getMockBuilder( '\\Aimeos\\Admin\\JsonAdm\\Common\\Decorator\Base' ) |
|
| 29 | - ->setConstructorArgs( [$this->stub, $context, $this->view, [], ''] ) |
|
| 28 | + $this->object = $this->getMockBuilder('\\Aimeos\\Admin\\JsonAdm\\Common\\Decorator\Base') |
|
| 29 | + ->setConstructorArgs([$this->stub, $context, $this->view, [], '']) |
|
| 30 | 30 | ->getMockForAbstractClass(); |
| 31 | 31 | } |
| 32 | 32 | |
| 33 | 33 | |
| 34 | 34 | protected function tearDown() |
| 35 | 35 | { |
| 36 | - unset( $this->object, $this->stub, $this->view ); |
|
| 36 | + unset($this->object, $this->stub, $this->view); |
|
| 37 | 37 | } |
| 38 | 38 | |
| 39 | 39 | |
| 40 | 40 | public function testDelete() |
| 41 | 41 | { |
| 42 | - $this->stub->expects( $this->once() )->method( 'delete' )->will( $this->returnArgument( 1 ) ); |
|
| 42 | + $this->stub->expects($this->once())->method('delete')->will($this->returnArgument(1)); |
|
| 43 | 43 | $response = $this->view->response(); |
| 44 | 44 | |
| 45 | - $this->assertSame( $response, $this->object->delete( $this->view->request(), $response ) ); |
|
| 45 | + $this->assertSame($response, $this->object->delete($this->view->request(), $response)); |
|
| 46 | 46 | } |
| 47 | 47 | |
| 48 | 48 | |
| 49 | 49 | public function testGet() |
| 50 | 50 | { |
| 51 | - $this->stub->expects( $this->once() )->method( 'get' )->will( $this->returnArgument( 1 ) ); |
|
| 51 | + $this->stub->expects($this->once())->method('get')->will($this->returnArgument(1)); |
|
| 52 | 52 | $response = $this->view->response(); |
| 53 | 53 | |
| 54 | - $this->assertSame( $response, $this->object->get( $this->view->request(), $response ) ); |
|
| 54 | + $this->assertSame($response, $this->object->get($this->view->request(), $response)); |
|
| 55 | 55 | } |
| 56 | 56 | |
| 57 | 57 | |
| 58 | 58 | public function testPatch() |
| 59 | 59 | { |
| 60 | - $this->stub->expects( $this->once() )->method( 'patch' )->will( $this->returnArgument( 1 ) ); |
|
| 60 | + $this->stub->expects($this->once())->method('patch')->will($this->returnArgument(1)); |
|
| 61 | 61 | $response = $this->view->response(); |
| 62 | 62 | |
| 63 | - $this->assertSame( $response, $this->object->patch( $this->view->request(), $response ) ); |
|
| 63 | + $this->assertSame($response, $this->object->patch($this->view->request(), $response)); |
|
| 64 | 64 | } |
| 65 | 65 | |
| 66 | 66 | |
| 67 | 67 | public function testPost() |
| 68 | 68 | { |
| 69 | - $this->stub->expects( $this->once() )->method( 'post' )->will( $this->returnArgument( 1 ) ); |
|
| 69 | + $this->stub->expects($this->once())->method('post')->will($this->returnArgument(1)); |
|
| 70 | 70 | $response = $this->view->response(); |
| 71 | 71 | |
| 72 | - $this->assertSame( $response, $this->object->post( $this->view->request(), $response ) ); |
|
| 72 | + $this->assertSame($response, $this->object->post($this->view->request(), $response)); |
|
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | |
| 76 | 76 | public function testPut() |
| 77 | 77 | { |
| 78 | - $this->stub->expects( $this->once() )->method( 'put' )->will( $this->returnArgument( 1 ) ); |
|
| 78 | + $this->stub->expects($this->once())->method('put')->will($this->returnArgument(1)); |
|
| 79 | 79 | $response = $this->view->response(); |
| 80 | 80 | |
| 81 | - $this->assertSame( $response, $this->object->put( $this->view->request(), $response ) ); |
|
| 81 | + $this->assertSame($response, $this->object->put($this->view->request(), $response)); |
|
| 82 | 82 | } |
| 83 | 83 | |
| 84 | 84 | |
| 85 | 85 | public function testOptions() |
| 86 | 86 | { |
| 87 | - $this->stub->expects( $this->once() )->method( 'options' )->will( $this->returnArgument( 1 ) ); |
|
| 87 | + $this->stub->expects($this->once())->method('options')->will($this->returnArgument(1)); |
|
| 88 | 88 | $response = $this->view->response(); |
| 89 | 89 | |
| 90 | - $this->assertSame( $response, $this->object->options( $this->view->request(), $response ) ); |
|
| 90 | + $this->assertSame($response, $this->object->options($this->view->request(), $response)); |
|
| 91 | 91 | } |
| 92 | 92 | |
| 93 | 93 | |
| 94 | 94 | public function testGetClient() |
| 95 | 95 | { |
| 96 | - $result = $this->access( 'getClient' )->invokeArgs( $this->object, [] ); |
|
| 97 | - $this->assertSame( $this->stub, $result ); |
|
| 96 | + $result = $this->access('getClient')->invokeArgs($this->object, []); |
|
| 97 | + $this->assertSame($this->stub, $result); |
|
| 98 | 98 | } |
| 99 | 99 | |
| 100 | 100 | |
| 101 | - protected function access( $name ) |
|
| 101 | + protected function access($name) |
|
| 102 | 102 | { |
| 103 | - $class = new \ReflectionClass( '\Aimeos\Admin\JsonAdm\Common\Decorator\Base' ); |
|
| 104 | - $method = $class->getMethod( $name ); |
|
| 105 | - $method->setAccessible( true ); |
|
| 103 | + $class = new \ReflectionClass('\Aimeos\Admin\JsonAdm\Common\Decorator\Base'); |
|
| 104 | + $method = $class->getMethod($name); |
|
| 105 | + $method->setAccessible(true); |
|
| 106 | 106 | |
| 107 | 107 | return $method; |
| 108 | 108 | } |
@@ -110,7 +110,7 @@ discard block |
||
| 110 | 110 | * @param \Psr\Http\Message\ResponseInterface $response Response object |
| 111 | 111 | * @return \Psr\Http\Message\ResponseInterface Modified response object |
| 112 | 112 | */ |
| 113 | - public function get( ServerRequestInterface $request, ResponseInterface $response ) |
|
| 113 | + public function get(ServerRequestInterface $request, ResponseInterface $response) |
|
| 114 | 114 | { |
| 115 | 115 | /** admin/jsonadm/partials/catalog/template-data |
| 116 | 116 | * Relative path to the data partial template file for the catalog client |
@@ -127,9 +127,9 @@ discard block |
||
| 127 | 127 | * @since 2016.07 |
| 128 | 128 | * @category Developer |
| 129 | 129 | */ |
| 130 | - $this->getView()->assign( array( 'partial-data' => 'admin/jsonadm/partials/catalog/template-data' ) ); |
|
| 130 | + $this->getView()->assign(array('partial-data' => 'admin/jsonadm/partials/catalog/template-data')); |
|
| 131 | 131 | |
| 132 | - return parent::get( $request, $response ); |
|
| 132 | + return parent::get($request, $response); |
|
| 133 | 133 | } |
| 134 | 134 | |
| 135 | 135 | |
@@ -140,14 +140,14 @@ discard block |
||
| 140 | 140 | * @param array $include List of resource types that should be fetched |
| 141 | 141 | * @return array List of items implementing \Aimeos\MShop\Common\Item\Iface |
| 142 | 142 | */ |
| 143 | - protected function getChildItems( array $items, array $include ) |
|
| 143 | + protected function getChildItems(array $items, array $include) |
|
| 144 | 144 | { |
| 145 | 145 | $list = []; |
| 146 | 146 | |
| 147 | - if( in_array( 'catalog', $include ) ) |
|
| 147 | + if (in_array('catalog', $include)) |
|
| 148 | 148 | { |
| 149 | - foreach( $items as $item ) { |
|
| 150 | - $list = array_merge( $list, $item->getChildren() ); |
|
| 149 | + foreach ($items as $item) { |
|
| 150 | + $list = array_merge($list, $item->getChildren()); |
|
| 151 | 151 | } |
| 152 | 152 | } |
| 153 | 153 | |
@@ -162,35 +162,35 @@ discard block |
||
| 162 | 162 | * @param \Psr\Http\Message\ResponseInterface $response Response object |
| 163 | 163 | * @return \Psr\Http\Message\ResponseInterface Modified response object |
| 164 | 164 | */ |
| 165 | - protected function getItems( \Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response ) |
|
| 165 | + protected function getItems(\Aimeos\MW\View\Iface $view, ServerRequestInterface $request, ResponseInterface $response) |
|
| 166 | 166 | { |
| 167 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'catalog' ); |
|
| 167 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'catalog'); |
|
| 168 | 168 | |
| 169 | - if( ( $key = $view->param( 'aggregate' ) ) !== null ) |
|
| 169 | + if (($key = $view->param('aggregate')) !== null) |
|
| 170 | 170 | { |
| 171 | - $search = $this->initCriteria( $manager->createSearch(), $view->param() ); |
|
| 172 | - $view->data = $manager->aggregate( $search, $key ); |
|
| 171 | + $search = $this->initCriteria($manager->createSearch(), $view->param()); |
|
| 172 | + $view->data = $manager->aggregate($search, $key); |
|
| 173 | 173 | return $response; |
| 174 | 174 | } |
| 175 | 175 | |
| 176 | - $include = ( ( $include = $view->param( 'include' ) ) !== null ? explode( ',', $include ) : [] ); |
|
| 177 | - $search = $this->initCriteria( $manager->createSearch(), $view->param() ); |
|
| 176 | + $include = (($include = $view->param('include')) !== null ? explode(',', $include) : []); |
|
| 177 | + $search = $this->initCriteria($manager->createSearch(), $view->param()); |
|
| 178 | 178 | $total = 1; |
| 179 | 179 | |
| 180 | - if( ( $id = $view->param( 'id' ) ) == null ) |
|
| 180 | + if (($id = $view->param('id')) == null) |
|
| 181 | 181 | { |
| 182 | - $view->data = $manager->searchItems( $search, [], $total ); |
|
| 183 | - $view->listItems = $this->getListItems( $view->data, $include ); |
|
| 184 | - $view->childItems = $this->getChildItems( $view->data, $include ); |
|
| 182 | + $view->data = $manager->searchItems($search, [], $total); |
|
| 183 | + $view->listItems = $this->getListItems($view->data, $include); |
|
| 184 | + $view->childItems = $this->getChildItems($view->data, $include); |
|
| 185 | 185 | } |
| 186 | 186 | else |
| 187 | 187 | { |
| 188 | - $view->data = $manager->getTree( $id, [], \Aimeos\MW\Tree\Manager\Base::LEVEL_LIST, $search ); |
|
| 189 | - $view->listItems = $this->getListItems( array( $id => $view->data ), $include ); |
|
| 190 | - $view->childItems = $this->getChildItems( array( $view->data ), $include ); |
|
| 188 | + $view->data = $manager->getTree($id, [], \Aimeos\MW\Tree\Manager\Base::LEVEL_LIST, $search); |
|
| 189 | + $view->listItems = $this->getListItems(array($id => $view->data), $include); |
|
| 190 | + $view->childItems = $this->getChildItems(array($view->data), $include); |
|
| 191 | 191 | } |
| 192 | 192 | |
| 193 | - $view->refItems = $this->getRefItems( $view->listItems ); |
|
| 193 | + $view->refItems = $this->getRefItems($view->listItems); |
|
| 194 | 194 | $view->total = $total; |
| 195 | 195 | |
| 196 | 196 | return $response; |
@@ -204,18 +204,18 @@ discard block |
||
| 204 | 204 | * @param array $include List of resource types that should be fetched |
| 205 | 205 | * @return array List of items implementing \Aimeos\MShop\Common\Item\Lists\Iface |
| 206 | 206 | */ |
| 207 | - protected function getListItems( array $items, array $include ) |
|
| 207 | + protected function getListItems(array $items, array $include) |
|
| 208 | 208 | { |
| 209 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'catalog/lists' ); |
|
| 209 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'catalog/lists'); |
|
| 210 | 210 | |
| 211 | 211 | $search = $manager->createSearch(); |
| 212 | 212 | $expr = array( |
| 213 | - $search->compare( '==', 'catalog.lists.parentid', array_keys( $items ) ), |
|
| 214 | - $search->compare( '==', 'catalog.lists.domain', $include ), |
|
| 213 | + $search->compare('==', 'catalog.lists.parentid', array_keys($items)), |
|
| 214 | + $search->compare('==', 'catalog.lists.domain', $include), |
|
| 215 | 215 | ); |
| 216 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
| 216 | + $search->setConditions($search->combine('&&', $expr)); |
|
| 217 | 217 | |
| 218 | - return $manager->searchItems( $search ); |
|
| 218 | + return $manager->searchItems($search); |
|
| 219 | 219 | } |
| 220 | 220 | |
| 221 | 221 | |
@@ -226,32 +226,32 @@ discard block |
||
| 226 | 226 | * @param \stdClass $entry Object including "id" and "attributes" elements |
| 227 | 227 | * @return \Aimeos\MShop\Common\Item\Iface New or updated item |
| 228 | 228 | */ |
| 229 | - protected function saveEntry( \Aimeos\MShop\Common\Manager\Iface $manager, \stdClass $entry ) |
|
| 229 | + protected function saveEntry(\Aimeos\MShop\Common\Manager\Iface $manager, \stdClass $entry) |
|
| 230 | 230 | { |
| 231 | - $targetId = ( isset( $entry->targetid ) ? $entry->targetid : null ); |
|
| 232 | - $refId = ( isset( $entry->refid ) ? $entry->refid : null ); |
|
| 231 | + $targetId = (isset($entry->targetid) ? $entry->targetid : null); |
|
| 232 | + $refId = (isset($entry->refid) ? $entry->refid : null); |
|
| 233 | 233 | |
| 234 | - if( isset( $entry->id ) ) |
|
| 234 | + if (isset($entry->id)) |
|
| 235 | 235 | { |
| 236 | - $item = $manager->getItem( $entry->id ); |
|
| 237 | - $item = $this->addItemData( $manager, $item, $entry, $item->getResourceType() ); |
|
| 238 | - $manager->saveItem( $item ); |
|
| 236 | + $item = $manager->getItem($entry->id); |
|
| 237 | + $item = $this->addItemData($manager, $item, $entry, $item->getResourceType()); |
|
| 238 | + $manager->saveItem($item); |
|
| 239 | 239 | |
| 240 | - if( isset( $entry->parentid ) && $targetId !== null ) { |
|
| 241 | - $manager->moveItem( $item->getId(), $entry->parentid, $targetId, $refId ); |
|
| 240 | + if (isset($entry->parentid) && $targetId !== null) { |
|
| 241 | + $manager->moveItem($item->getId(), $entry->parentid, $targetId, $refId); |
|
| 242 | 242 | } |
| 243 | 243 | } |
| 244 | 244 | else |
| 245 | 245 | { |
| 246 | 246 | $item = $manager->createItem(); |
| 247 | - $item = $this->addItemData( $manager, $item, $entry, $item->getResourceType() ); |
|
| 248 | - $manager->insertItem( $item, $targetId, $refId ); |
|
| 247 | + $item = $this->addItemData($manager, $item, $entry, $item->getResourceType()); |
|
| 248 | + $manager->insertItem($item, $targetId, $refId); |
|
| 249 | 249 | } |
| 250 | 250 | |
| 251 | - if( isset( $entry->relationships ) ) { |
|
| 252 | - $this->saveRelationships( $manager, $item, $entry->relationships ); |
|
| 251 | + if (isset($entry->relationships)) { |
|
| 252 | + $this->saveRelationships($manager, $item, $entry->relationships); |
|
| 253 | 253 | } |
| 254 | 254 | |
| 255 | - return $manager->getItem( $item->getId() ); |
|
| 255 | + return $manager->getItem($item->getId()); |
|
| 256 | 256 | } |
| 257 | 257 | } |
@@ -107,20 +107,20 @@ discard block |
||
| 107 | 107 | * @param array $include List of resource types that should be fetched |
| 108 | 108 | * @return array List of items implementing \Aimeos\MShop\Common\Item\Iface |
| 109 | 109 | */ |
| 110 | - protected function getChildItems( array $items, array $include ) |
|
| 110 | + protected function getChildItems(array $items, array $include) |
|
| 111 | 111 | { |
| 112 | 112 | $list = []; |
| 113 | - $prodIds = array_keys( $items ); |
|
| 114 | - $include = array_intersect( $include, array( 'product/property' ) ); |
|
| 113 | + $prodIds = array_keys($items); |
|
| 114 | + $include = array_intersect($include, array('product/property')); |
|
| 115 | 115 | |
| 116 | - foreach( $include as $type ) |
|
| 116 | + foreach ($include as $type) |
|
| 117 | 117 | { |
| 118 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), $type ); |
|
| 118 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), $type); |
|
| 119 | 119 | |
| 120 | 120 | $search = $manager->createSearch(); |
| 121 | - $search->setConditions( $search->compare( '==', str_replace( '/', '.', $type ) . '.parentid', $prodIds ) ); |
|
| 121 | + $search->setConditions($search->compare('==', str_replace('/', '.', $type) . '.parentid', $prodIds)); |
|
| 122 | 122 | |
| 123 | - $list = array_merge( $list, $manager->searchItems( $search ) ); |
|
| 123 | + $list = array_merge($list, $manager->searchItems($search)); |
|
| 124 | 124 | } |
| 125 | 125 | |
| 126 | 126 | return $list; |
@@ -134,17 +134,17 @@ discard block |
||
| 134 | 134 | * @param array $include List of resource types that should be fetched |
| 135 | 135 | * @return array List of items implementing \Aimeos\MShop\Common\Item\Lists\Iface |
| 136 | 136 | */ |
| 137 | - protected function getListItems( array $items, array $include ) |
|
| 137 | + protected function getListItems(array $items, array $include) |
|
| 138 | 138 | { |
| 139 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/lists' ); |
|
| 139 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/lists'); |
|
| 140 | 140 | |
| 141 | 141 | $search = $manager->createSearch(); |
| 142 | 142 | $expr = array( |
| 143 | - $search->compare( '==', 'product.lists.parentid', array_keys( $items ) ), |
|
| 144 | - $search->compare( '==', 'product.lists.domain', $include ), |
|
| 143 | + $search->compare('==', 'product.lists.parentid', array_keys($items)), |
|
| 144 | + $search->compare('==', 'product.lists.domain', $include), |
|
| 145 | 145 | ); |
| 146 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
| 146 | + $search->setConditions($search->combine('&&', $expr)); |
|
| 147 | 147 | |
| 148 | - return $manager->searchItems( $search ); |
|
| 148 | + return $manager->searchItems($search); |
|
| 149 | 149 | } |
| 150 | 150 | } |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | * @param array $templatePaths List of file system paths where the templates are stored |
| 34 | 34 | * @param string $path Name of the client separated by slashes, e.g "product/property" |
| 35 | 35 | */ |
| 36 | - public function __construct( \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MW\View\Iface $view, array $templatePaths, $path ) |
|
| 36 | + public function __construct(\Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MW\View\Iface $view, array $templatePaths, $path) |
|
| 37 | 37 | { |
| 38 | 38 | $this->view = $view; |
| 39 | 39 | $this->context = $context; |
@@ -49,9 +49,9 @@ discard block |
||
| 49 | 49 | * @param array $param List of method parameter |
| 50 | 50 | * @throws \Aimeos\Admin\JsonAdm\Exception If method call failed |
| 51 | 51 | */ |
| 52 | - public function __call( $name, array $param ) |
|
| 52 | + public function __call($name, array $param) |
|
| 53 | 53 | { |
| 54 | - throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Unable to call method "%1$s"', $name ) ); |
|
| 54 | + throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Unable to call method "%1$s"', $name)); |
|
| 55 | 55 | } |
| 56 | 56 | |
| 57 | 57 | |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | * @param array $include List of resource types that should be fetched |
| 63 | 63 | * @return array List of items implementing \Aimeos\MShop\Common\Item\Iface |
| 64 | 64 | */ |
| 65 | - protected function getChildItems( array $items, array $include ) |
|
| 65 | + protected function getChildItems(array $items, array $include) |
|
| 66 | 66 | { |
| 67 | 67 | return []; |
| 68 | 68 | } |
@@ -85,9 +85,9 @@ discard block |
||
| 85 | 85 | * @param \Aimeos\MW\View\Iface $view View object with "resource" parameter |
| 86 | 86 | * @return array List of domain names |
| 87 | 87 | */ |
| 88 | - protected function getDomains( \Aimeos\MW\View\Iface $view ) |
|
| 88 | + protected function getDomains(\Aimeos\MW\View\Iface $view) |
|
| 89 | 89 | { |
| 90 | - if( ( $domains = $view->param( 'resource' ) ) == '' ) |
|
| 90 | + if (($domains = $view->param('resource')) == '') |
|
| 91 | 91 | { |
| 92 | 92 | /** admin/jsonadm/domains |
| 93 | 93 | * A list of domain names whose clients are available for the JSON API |
@@ -109,7 +109,7 @@ discard block |
||
| 109 | 109 | 'attribute', 'catalog', 'coupon', 'customer', 'locale', 'media', 'order', |
| 110 | 110 | 'plugin', 'price', 'product', 'service', 'supplier', 'stock', 'tag', 'text' |
| 111 | 111 | ); |
| 112 | - $domains = $this->getContext()->getConfig()->get( 'admin/jsonadm/domains', $default ); |
|
| 112 | + $domains = $this->getContext()->getConfig()->get('admin/jsonadm/domains', $default); |
|
| 113 | 113 | } |
| 114 | 114 | |
| 115 | 115 | return (array) $domains; |
@@ -122,15 +122,15 @@ discard block |
||
| 122 | 122 | * @param \stdClass $request Decoded request body |
| 123 | 123 | * @return array List of item IDs |
| 124 | 124 | */ |
| 125 | - protected function getIds( $request ) |
|
| 125 | + protected function getIds($request) |
|
| 126 | 126 | { |
| 127 | 127 | $ids = []; |
| 128 | 128 | |
| 129 | - if( isset( $request->data ) ) |
|
| 129 | + if (isset($request->data)) |
|
| 130 | 130 | { |
| 131 | - foreach( (array) $request->data as $entry ) |
|
| 131 | + foreach ((array) $request->data as $entry) |
|
| 132 | 132 | { |
| 133 | - if( isset( $entry->id ) ) { |
|
| 133 | + if (isset($entry->id)) { |
|
| 134 | 134 | $ids[] = $entry->id; |
| 135 | 135 | } |
| 136 | 136 | } |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | * @param array $include List of resource types that should be fetched |
| 148 | 148 | * @return array List of items implementing \Aimeos\MShop\Common\Item\Lists\Iface |
| 149 | 149 | */ |
| 150 | - protected function getListItems( array $items, array $include ) |
|
| 150 | + protected function getListItems(array $items, array $include) |
|
| 151 | 151 | { |
| 152 | 152 | return []; |
| 153 | 153 | } |
@@ -170,23 +170,23 @@ discard block |
||
| 170 | 170 | * @param array $listItems List of items implementing \Aimeos\MShop\Common\Item\Lists\Iface |
| 171 | 171 | * @return array List of items implementing \Aimeos\MShop\Common\Item\Iface |
| 172 | 172 | */ |
| 173 | - protected function getRefItems( array $listItems ) |
|
| 173 | + protected function getRefItems(array $listItems) |
|
| 174 | 174 | { |
| 175 | 175 | $list = $map = []; |
| 176 | 176 | $context = $this->getContext(); |
| 177 | 177 | |
| 178 | - foreach( $listItems as $listItem ) { |
|
| 178 | + foreach ($listItems as $listItem) { |
|
| 179 | 179 | $map[$listItem->getDomain()][] = $listItem->getRefId(); |
| 180 | 180 | } |
| 181 | 181 | |
| 182 | - foreach( $map as $domain => $ids ) |
|
| 182 | + foreach ($map as $domain => $ids) |
|
| 183 | 183 | { |
| 184 | - $manager = \Aimeos\MShop\Factory::createManager( $context, $domain ); |
|
| 184 | + $manager = \Aimeos\MShop\Factory::createManager($context, $domain); |
|
| 185 | 185 | |
| 186 | 186 | $search = $manager->createSearch(); |
| 187 | - $search->setConditions( $search->compare( '==', $domain . '.id', $ids ) ); |
|
| 187 | + $search->setConditions($search->compare('==', $domain . '.id', $ids)); |
|
| 188 | 188 | |
| 189 | - $list = array_merge( $list, $manager->searchItems( $search ) ); |
|
| 189 | + $list = array_merge($list, $manager->searchItems($search)); |
|
| 190 | 190 | } |
| 191 | 191 | |
| 192 | 192 | return $list; |
@@ -222,11 +222,11 @@ discard block |
||
| 222 | 222 | * @param array $params List of criteria data with condition, sorting and paging |
| 223 | 223 | * @return \Aimeos\MW\Criteria\Iface Initialized criteria object |
| 224 | 224 | */ |
| 225 | - protected function initCriteria( \Aimeos\MW\Criteria\Iface $criteria, array $params ) |
|
| 225 | + protected function initCriteria(\Aimeos\MW\Criteria\Iface $criteria, array $params) |
|
| 226 | 226 | { |
| 227 | - $this->initCriteriaConditions( $criteria, $params ); |
|
| 228 | - $this->initCriteriaSortations( $criteria, $params ); |
|
| 229 | - $this->initCriteriaSlice( $criteria, $params ); |
|
| 227 | + $this->initCriteriaConditions($criteria, $params); |
|
| 228 | + $this->initCriteriaSortations($criteria, $params); |
|
| 229 | + $this->initCriteriaSlice($criteria, $params); |
|
| 230 | 230 | |
| 231 | 231 | return $criteria; |
| 232 | 232 | } |
@@ -238,17 +238,17 @@ discard block |
||
| 238 | 238 | * @param \Aimeos\MW\Criteria\Iface $criteria Criteria object |
| 239 | 239 | * @param array $params List of criteria data with condition, sorting and paging |
| 240 | 240 | */ |
| 241 | - protected function initCriteriaConditions( \Aimeos\MW\Criteria\Iface $criteria, array $params ) |
|
| 241 | + protected function initCriteriaConditions(\Aimeos\MW\Criteria\Iface $criteria, array $params) |
|
| 242 | 242 | { |
| 243 | - if( !isset( $params['filter'] ) ) { |
|
| 243 | + if (!isset($params['filter'])) { |
|
| 244 | 244 | return; |
| 245 | 245 | } |
| 246 | 246 | |
| 247 | 247 | $existing = $criteria->getConditions(); |
| 248 | - $criteria->setConditions( $criteria->toConditions( (array) $params['filter'] ) ); |
|
| 248 | + $criteria->setConditions($criteria->toConditions((array) $params['filter'])); |
|
| 249 | 249 | |
| 250 | - $expr = array( $criteria->getConditions(), $existing ); |
|
| 251 | - $criteria->setConditions( $criteria->combine( '&&', $expr ) ); |
|
| 250 | + $expr = array($criteria->getConditions(), $existing); |
|
| 251 | + $criteria->setConditions($criteria->combine('&&', $expr)); |
|
| 252 | 252 | } |
| 253 | 253 | |
| 254 | 254 | |
@@ -258,12 +258,12 @@ discard block |
||
| 258 | 258 | * @param \Aimeos\MW\Criteria\Iface $criteria Criteria object |
| 259 | 259 | * @param array $params List of criteria data with condition, sorting and paging |
| 260 | 260 | */ |
| 261 | - protected function initCriteriaSlice( \Aimeos\MW\Criteria\Iface $criteria, array $params ) |
|
| 261 | + protected function initCriteriaSlice(\Aimeos\MW\Criteria\Iface $criteria, array $params) |
|
| 262 | 262 | { |
| 263 | - $start = ( isset( $params['page']['offset'] ) ? (int) $params['page']['offset'] : 0 ); |
|
| 264 | - $size = ( isset( $params['page']['limit'] ) ? (int) $params['page']['limit'] : 25 ); |
|
| 263 | + $start = (isset($params['page']['offset']) ? (int) $params['page']['offset'] : 0); |
|
| 264 | + $size = (isset($params['page']['limit']) ? (int) $params['page']['limit'] : 25); |
|
| 265 | 265 | |
| 266 | - $criteria->setSlice( $start, $size ); |
|
| 266 | + $criteria->setSlice($start, $size); |
|
| 267 | 267 | } |
| 268 | 268 | |
| 269 | 269 | |
@@ -273,24 +273,24 @@ discard block |
||
| 273 | 273 | * @param \Aimeos\MW\Criteria\Iface $criteria Criteria object |
| 274 | 274 | * @param array $params List of criteria data with condition, sorting and paging |
| 275 | 275 | */ |
| 276 | - protected function initCriteriaSortations( \Aimeos\MW\Criteria\Iface $criteria, array $params ) |
|
| 276 | + protected function initCriteriaSortations(\Aimeos\MW\Criteria\Iface $criteria, array $params) |
|
| 277 | 277 | { |
| 278 | - if( !isset( $params['sort'] ) ) { |
|
| 278 | + if (!isset($params['sort'])) { |
|
| 279 | 279 | return; |
| 280 | 280 | } |
| 281 | 281 | |
| 282 | 282 | $sortation = []; |
| 283 | 283 | |
| 284 | - foreach( explode( ',', $params['sort'] ) as $sort ) |
|
| 284 | + foreach (explode(',', $params['sort']) as $sort) |
|
| 285 | 285 | { |
| 286 | - if( $sort[0] === '-' ) { |
|
| 287 | - $sortation[] = $criteria->sort( '-', substr( $sort, 1 ) ); |
|
| 286 | + if ($sort[0] === '-') { |
|
| 287 | + $sortation[] = $criteria->sort('-', substr($sort, 1)); |
|
| 288 | 288 | } else { |
| 289 | - $sortation[] = $criteria->sort( '+', $sort ); |
|
| 289 | + $sortation[] = $criteria->sort('+', $sort); |
|
| 290 | 290 | } |
| 291 | 291 | } |
| 292 | 292 | |
| 293 | - $criteria->setSortations( $sortation ); |
|
| 293 | + $criteria->setSortations($sortation); |
|
| 294 | 294 | } |
| 295 | 295 | |
| 296 | 296 | |
@@ -301,14 +301,14 @@ discard block |
||
| 301 | 301 | * @param \stdClass $request Object with request body data |
| 302 | 302 | * @return array List of items |
| 303 | 303 | */ |
| 304 | - protected function saveData( \Aimeos\MShop\Common\Manager\Iface $manager, \stdClass $request ) |
|
| 304 | + protected function saveData(\Aimeos\MShop\Common\Manager\Iface $manager, \stdClass $request) |
|
| 305 | 305 | { |
| 306 | 306 | $data = []; |
| 307 | 307 | |
| 308 | - if( isset( $request->data ) ) |
|
| 308 | + if (isset($request->data)) |
|
| 309 | 309 | { |
| 310 | - foreach( (array) $request->data as $entry ) { |
|
| 311 | - $data[] = $this->saveEntry( $manager, $entry ); |
|
| 310 | + foreach ((array) $request->data as $entry) { |
|
| 311 | + $data[] = $this->saveEntry($manager, $entry); |
|
| 312 | 312 | } |
| 313 | 313 | } |
| 314 | 314 | |
@@ -323,22 +323,22 @@ discard block |
||
| 323 | 323 | * @param \stdClass $entry Object including "id" and "attributes" elements |
| 324 | 324 | * @return \Aimeos\MShop\Common\Item\Iface New or updated item |
| 325 | 325 | */ |
| 326 | - protected function saveEntry( \Aimeos\MShop\Common\Manager\Iface $manager, \stdClass $entry ) |
|
| 326 | + protected function saveEntry(\Aimeos\MShop\Common\Manager\Iface $manager, \stdClass $entry) |
|
| 327 | 327 | { |
| 328 | - if( isset( $entry->id ) ) { |
|
| 329 | - $item = $manager->getItem( $entry->id ); |
|
| 328 | + if (isset($entry->id)) { |
|
| 329 | + $item = $manager->getItem($entry->id); |
|
| 330 | 330 | } else { |
| 331 | 331 | $item = $manager->createItem(); |
| 332 | 332 | } |
| 333 | 333 | |
| 334 | - $item = $this->addItemData( $manager, $item, $entry, $item->getResourceType() ); |
|
| 335 | - $manager->saveItem( $item ); |
|
| 334 | + $item = $this->addItemData($manager, $item, $entry, $item->getResourceType()); |
|
| 335 | + $manager->saveItem($item); |
|
| 336 | 336 | |
| 337 | - if( isset( $entry->relationships ) ) { |
|
| 338 | - $this->saveRelationships( $manager, $item, $entry->relationships ); |
|
| 337 | + if (isset($entry->relationships)) { |
|
| 338 | + $this->saveRelationships($manager, $item, $entry->relationships); |
|
| 339 | 339 | } |
| 340 | 340 | |
| 341 | - return $manager->getItem( $item->getId() ); |
|
| 341 | + return $manager->getItem($item->getId()); |
|
| 342 | 342 | } |
| 343 | 343 | |
| 344 | 344 | |
@@ -349,28 +349,28 @@ discard block |
||
| 349 | 349 | * @param \Aimeos\MShop\Common\Item\Iface $item Domain item with an unique ID set |
| 350 | 350 | * @param \stdClass $relationships Object including the <domain>/data/attributes structure |
| 351 | 351 | */ |
| 352 | - protected function saveRelationships( \Aimeos\MShop\Common\Manager\Iface $manager, |
|
| 353 | - \Aimeos\MShop\Common\Item\Iface $item, \stdClass $relationships ) |
|
| 352 | + protected function saveRelationships(\Aimeos\MShop\Common\Manager\Iface $manager, |
|
| 353 | + \Aimeos\MShop\Common\Item\Iface $item, \stdClass $relationships) |
|
| 354 | 354 | { |
| 355 | 355 | $id = $item->getId(); |
| 356 | - $listManager = $manager->getSubManager( 'lists' ); |
|
| 356 | + $listManager = $manager->getSubManager('lists'); |
|
| 357 | 357 | |
| 358 | - foreach( (array) $relationships as $domain => $list ) |
|
| 358 | + foreach ((array) $relationships as $domain => $list) |
|
| 359 | 359 | { |
| 360 | - if( isset( $list->data ) ) |
|
| 360 | + if (isset($list->data)) |
|
| 361 | 361 | { |
| 362 | - foreach( (array) $list->data as $data ) |
|
| 362 | + foreach ((array) $list->data as $data) |
|
| 363 | 363 | { |
| 364 | - $listItem = $this->addItemData( $listManager, $listManager->createItem(), $data, $domain ); |
|
| 364 | + $listItem = $this->addItemData($listManager, $listManager->createItem(), $data, $domain); |
|
| 365 | 365 | |
| 366 | - if( isset( $data->id ) ) { |
|
| 367 | - $listItem->setRefId( $data->id ); |
|
| 366 | + if (isset($data->id)) { |
|
| 367 | + $listItem->setRefId($data->id); |
|
| 368 | 368 | } |
| 369 | 369 | |
| 370 | - $listItem->setParentId( $id ); |
|
| 371 | - $listItem->setDomain( $domain ); |
|
| 370 | + $listItem->setParentId($id); |
|
| 371 | + $listItem->setDomain($domain); |
|
| 372 | 372 | |
| 373 | - $listManager->saveItem( $listItem, false ); |
|
| 373 | + $listManager->saveItem($listItem, false); |
|
| 374 | 374 | } |
| 375 | 375 | } |
| 376 | 376 | } |
@@ -387,20 +387,20 @@ discard block |
||
| 387 | 387 | * @return \Aimeos\MShop\Common\Item\Iface Item including the data |
| 388 | 388 | */ |
| 389 | 389 | protected function addItemData(\Aimeos\MShop\Common\Manager\Iface $manager, |
| 390 | - \Aimeos\MShop\Common\Item\Iface $item, \stdClass $data, $domain ) |
|
| 390 | + \Aimeos\MShop\Common\Item\Iface $item, \stdClass $data, $domain) |
|
| 391 | 391 | { |
| 392 | - if( isset( $data->attributes ) ) |
|
| 392 | + if (isset($data->attributes)) |
|
| 393 | 393 | { |
| 394 | 394 | $attr = (array) $data->attributes; |
| 395 | - $key = str_replace( '/', '.', $item->getResourceType() ); |
|
| 395 | + $key = str_replace('/', '.', $item->getResourceType()); |
|
| 396 | 396 | |
| 397 | - if( isset( $attr[$key.'.type'] ) ) |
|
| 397 | + if (isset($attr[$key . '.type'])) |
|
| 398 | 398 | { |
| 399 | - $typeItem = $manager->getSubManager( 'type' )->findItem( $attr[$key.'.type'], [], $domain ); |
|
| 400 | - $attr[$key.'.typeid'] = $typeItem->getId(); |
|
| 399 | + $typeItem = $manager->getSubManager('type')->findItem($attr[$key . '.type'], [], $domain); |
|
| 400 | + $attr[$key . '.typeid'] = $typeItem->getId(); |
|
| 401 | 401 | } |
| 402 | 402 | |
| 403 | - $item->fromArray( $attr ); |
|
| 403 | + $item->fromArray($attr); |
|
| 404 | 404 | } |
| 405 | 405 | |
| 406 | 406 | return $item; |
@@ -107,20 +107,20 @@ discard block |
||
| 107 | 107 | * @param array $include List of resource types that should be fetched |
| 108 | 108 | * @return array List of items implementing \Aimeos\MShop\Common\Item\Iface |
| 109 | 109 | */ |
| 110 | - protected function getChildItems( array $items, array $include ) |
|
| 110 | + protected function getChildItems(array $items, array $include) |
|
| 111 | 111 | { |
| 112 | 112 | $list = []; |
| 113 | - $refIds = array_keys( $items ); |
|
| 114 | - $include = array_intersect( $include, array( 'customer/address' ) ); |
|
| 113 | + $refIds = array_keys($items); |
|
| 114 | + $include = array_intersect($include, array('customer/address')); |
|
| 115 | 115 | |
| 116 | - foreach( $include as $type ) |
|
| 116 | + foreach ($include as $type) |
|
| 117 | 117 | { |
| 118 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), $type ); |
|
| 118 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), $type); |
|
| 119 | 119 | |
| 120 | 120 | $search = $manager->createSearch(); |
| 121 | - $search->setConditions( $search->compare( '==', str_replace( '/', '.', $type ) . '.parentid', $refIds ) ); |
|
| 121 | + $search->setConditions($search->compare('==', str_replace('/', '.', $type) . '.parentid', $refIds)); |
|
| 122 | 122 | |
| 123 | - $list = array_merge( $list, $manager->searchItems( $search ) ); |
|
| 123 | + $list = array_merge($list, $manager->searchItems($search)); |
|
| 124 | 124 | } |
| 125 | 125 | |
| 126 | 126 | return $list; |
@@ -134,17 +134,17 @@ discard block |
||
| 134 | 134 | * @param array $include List of resource types that should be fetched |
| 135 | 135 | * @return array List of items implementing \Aimeos\MShop\Common\Item\Lists\Iface |
| 136 | 136 | */ |
| 137 | - protected function getListItems( array $items, array $include ) |
|
| 137 | + protected function getListItems(array $items, array $include) |
|
| 138 | 138 | { |
| 139 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/lists' ); |
|
| 139 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/lists'); |
|
| 140 | 140 | |
| 141 | 141 | $search = $manager->createSearch(); |
| 142 | 142 | $expr = array( |
| 143 | - $search->compare( '==', 'customer.lists.parentid', array_keys( $items ) ), |
|
| 144 | - $search->compare( '==', 'customer.lists.domain', $include ), |
|
| 143 | + $search->compare('==', 'customer.lists.parentid', array_keys($items)), |
|
| 144 | + $search->compare('==', 'customer.lists.domain', $include), |
|
| 145 | 145 | ); |
| 146 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
| 146 | + $search->setConditions($search->combine('&&', $expr)); |
|
| 147 | 147 | |
| 148 | - return $manager->searchItems( $search ); |
|
| 148 | + return $manager->searchItems($search); |
|
| 149 | 149 | } |
| 150 | 150 | } |
@@ -107,20 +107,20 @@ discard block |
||
| 107 | 107 | * @param array $include List of resource types that should be fetched |
| 108 | 108 | * @return array List of items implementing \Aimeos\MShop\Common\Item\Iface |
| 109 | 109 | */ |
| 110 | - protected function getChildItems( array $items, array $include ) |
|
| 110 | + protected function getChildItems(array $items, array $include) |
|
| 111 | 111 | { |
| 112 | 112 | $list = []; |
| 113 | - $refIds = array_keys( $items ); |
|
| 114 | - $include = array_intersect( $include, array( 'supplier/address' ) ); |
|
| 113 | + $refIds = array_keys($items); |
|
| 114 | + $include = array_intersect($include, array('supplier/address')); |
|
| 115 | 115 | |
| 116 | - foreach( $include as $type ) |
|
| 116 | + foreach ($include as $type) |
|
| 117 | 117 | { |
| 118 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), $type ); |
|
| 118 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), $type); |
|
| 119 | 119 | |
| 120 | 120 | $search = $manager->createSearch(); |
| 121 | - $search->setConditions( $search->compare( '==', str_replace( '/', '.', $type ) . '.parentid', $refIds ) ); |
|
| 121 | + $search->setConditions($search->compare('==', str_replace('/', '.', $type) . '.parentid', $refIds)); |
|
| 122 | 122 | |
| 123 | - $list = array_merge( $list, $manager->searchItems( $search ) ); |
|
| 123 | + $list = array_merge($list, $manager->searchItems($search)); |
|
| 124 | 124 | } |
| 125 | 125 | |
| 126 | 126 | return $list; |
@@ -134,17 +134,17 @@ discard block |
||
| 134 | 134 | * @param array $include List of resource types that should be fetched |
| 135 | 135 | * @return array List of items implementing \Aimeos\MShop\Common\Item\Lists\Iface |
| 136 | 136 | */ |
| 137 | - protected function getListItems( array $items, array $include ) |
|
| 137 | + protected function getListItems(array $items, array $include) |
|
| 138 | 138 | { |
| 139 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'supplier/lists' ); |
|
| 139 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'supplier/lists'); |
|
| 140 | 140 | |
| 141 | 141 | $search = $manager->createSearch(); |
| 142 | 142 | $expr = array( |
| 143 | - $search->compare( '==', 'supplier.lists.parentid', array_keys( $items ) ), |
|
| 144 | - $search->compare( '==', 'supplier.lists.domain', $include ), |
|
| 143 | + $search->compare('==', 'supplier.lists.parentid', array_keys($items)), |
|
| 144 | + $search->compare('==', 'supplier.lists.domain', $include), |
|
| 145 | 145 | ); |
| 146 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
| 146 | + $search->setConditions($search->combine('&&', $expr)); |
|
| 147 | 147 | |
| 148 | - return $manager->searchItems( $search ); |
|
| 148 | + return $manager->searchItems($search); |
|
| 149 | 149 | } |
| 150 | 150 | } |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | * @param string $classname Full name of the class for which the object should be returned |
| 32 | 32 | * @param \Aimeos\Admin\JsonAdm\Iface|null $client JSON API client object |
| 33 | 33 | */ |
| 34 | - public static function injectClient( $classname, \Aimeos\Admin\JsonAdm\Iface $client = null ) |
|
| 34 | + public static function injectClient($classname, \Aimeos\Admin\JsonAdm\Iface $client = null) |
|
| 35 | 35 | { |
| 36 | 36 | self::$objects[$classname] = $client; |
| 37 | 37 | } |
@@ -47,8 +47,8 @@ discard block |
||
| 47 | 47 | * @param string $path Name of the client separated by slashes, e.g "product/property" |
| 48 | 48 | * @return \Aimeos\Admin\JsonAdm\Common\Iface Client object |
| 49 | 49 | */ |
| 50 | - protected static function addClientDecorators( \Aimeos\Admin\JsonAdm\Iface $client, |
|
| 51 | - \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MW\View\Iface $view, array $templatePaths, $path ) |
|
| 50 | + protected static function addClientDecorators(\Aimeos\Admin\JsonAdm\Iface $client, |
|
| 51 | + \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MW\View\Iface $view, array $templatePaths, $path) |
|
| 52 | 52 | { |
| 53 | 53 | $config = $context->getConfig(); |
| 54 | 54 | |
@@ -74,38 +74,38 @@ discard block |
||
| 74 | 74 | * @since 2015.12 |
| 75 | 75 | * @category Developer |
| 76 | 76 | */ |
| 77 | - $decorators = $config->get( 'admin/jsonadm/common/decorators/default', [] ); |
|
| 77 | + $decorators = $config->get('admin/jsonadm/common/decorators/default', []); |
|
| 78 | 78 | |
| 79 | - if( $path !== null && is_string( $path ) ) |
|
| 79 | + if ($path !== null && is_string($path)) |
|
| 80 | 80 | { |
| 81 | - $dpath = trim( $path, '/' ); |
|
| 82 | - $dpath = ( $dpath !== '' ? $dpath . '/' : $dpath ); |
|
| 81 | + $dpath = trim($path, '/'); |
|
| 82 | + $dpath = ($dpath !== '' ? $dpath . '/' : $dpath); |
|
| 83 | 83 | |
| 84 | - $excludes = $config->get( 'admin/jsonadm/' . $dpath . 'decorators/excludes', [] ); |
|
| 85 | - $localClass = str_replace( ' ', '\\', ucwords( str_replace( '/', ' ', $path ) ) ); |
|
| 84 | + $excludes = $config->get('admin/jsonadm/' . $dpath . 'decorators/excludes', []); |
|
| 85 | + $localClass = str_replace(' ', '\\', ucwords(str_replace('/', ' ', $path))); |
|
| 86 | 86 | |
| 87 | - foreach( $decorators as $key => $name ) |
|
| 87 | + foreach ($decorators as $key => $name) |
|
| 88 | 88 | { |
| 89 | - if( in_array( $name, $excludes ) ) { |
|
| 90 | - unset( $decorators[$key] ); |
|
| 89 | + if (in_array($name, $excludes)) { |
|
| 90 | + unset($decorators[$key]); |
|
| 91 | 91 | } |
| 92 | 92 | } |
| 93 | 93 | |
| 94 | 94 | $classprefix = '\\Aimeos\\Admin\\JsonAdm\\Common\\Decorator\\'; |
| 95 | - $decorators = $config->get( 'admin/jsonadm/' . $dpath . 'decorators/global', [] ); |
|
| 96 | - $client = self::addDecorators( $client, $decorators, $classprefix, $context, $view, $templatePaths, $path ); |
|
| 95 | + $decorators = $config->get('admin/jsonadm/' . $dpath . 'decorators/global', []); |
|
| 96 | + $client = self::addDecorators($client, $decorators, $classprefix, $context, $view, $templatePaths, $path); |
|
| 97 | 97 | |
| 98 | - if( !empty( $path ) ) |
|
| 98 | + if (!empty($path)) |
|
| 99 | 99 | { |
| 100 | - $classprefix = '\\Aimeos\\Admin\\JsonAdm\\' . ucfirst( $localClass ) . '\\Decorator\\'; |
|
| 101 | - $decorators = $config->get( 'admin/jsonadm/' . $dpath . 'decorators/local', [] ); |
|
| 102 | - $client = self::addDecorators( $client, $decorators, $classprefix, $context, $view, $templatePaths, $path ); |
|
| 100 | + $classprefix = '\\Aimeos\\Admin\\JsonAdm\\' . ucfirst($localClass) . '\\Decorator\\'; |
|
| 101 | + $decorators = $config->get('admin/jsonadm/' . $dpath . 'decorators/local', []); |
|
| 102 | + $client = self::addDecorators($client, $decorators, $classprefix, $context, $view, $templatePaths, $path); |
|
| 103 | 103 | } |
| 104 | 104 | } |
| 105 | 105 | else |
| 106 | 106 | { |
| 107 | 107 | $classprefix = '\\Aimeos\\Admin\\JsonAdm\\Common\\Decorator\\'; |
| 108 | - $client = self::addDecorators( $client, $decorators, $classprefix, $context, $view, $templatePaths, $path ); |
|
| 108 | + $client = self::addDecorators($client, $decorators, $classprefix, $context, $view, $templatePaths, $path); |
|
| 109 | 109 | } |
| 110 | 110 | |
| 111 | 111 | return $client; |
@@ -124,29 +124,29 @@ discard block |
||
| 124 | 124 | * @param string $path Name of the client separated by slashes, e.g "product/stock" |
| 125 | 125 | * @return \Aimeos\Admin\JsonAdm\Common\Iface Client object |
| 126 | 126 | */ |
| 127 | - protected static function addDecorators( \Aimeos\Admin\JsonAdm\Iface $client, array $decorators, $classprefix, |
|
| 128 | - \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MW\View\Iface $view, $templatePaths, $path ) |
|
| 127 | + protected static function addDecorators(\Aimeos\Admin\JsonAdm\Iface $client, array $decorators, $classprefix, |
|
| 128 | + \Aimeos\MShop\Context\Item\Iface $context, \Aimeos\MW\View\Iface $view, $templatePaths, $path) |
|
| 129 | 129 | { |
| 130 | 130 | $iface = '\\Aimeos\\Admin\\JsonAdm\\Common\\Decorator\\Iface'; |
| 131 | 131 | |
| 132 | - foreach( $decorators as $name ) |
|
| 132 | + foreach ($decorators as $name) |
|
| 133 | 133 | { |
| 134 | - if( ctype_alnum( $name ) === false ) |
|
| 134 | + if (ctype_alnum($name) === false) |
|
| 135 | 135 | { |
| 136 | - $classname = is_string( $name ) ? $classprefix . $name : '<not a string>'; |
|
| 137 | - throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Invalid class name "%1$s"', $classname ), 404 ); |
|
| 136 | + $classname = is_string($name) ? $classprefix . $name : '<not a string>'; |
|
| 137 | + throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Invalid class name "%1$s"', $classname), 404); |
|
| 138 | 138 | } |
| 139 | 139 | |
| 140 | 140 | $classname = $classprefix . $name; |
| 141 | 141 | |
| 142 | - if( class_exists( $classname ) === false ) { |
|
| 143 | - throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Class "%1$s" not found', $classname ), 404 ); |
|
| 142 | + if (class_exists($classname) === false) { |
|
| 143 | + throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Class "%1$s" not found', $classname), 404); |
|
| 144 | 144 | } |
| 145 | 145 | |
| 146 | - $client = new $classname( $client, $context, $view, $templatePaths, $path ); |
|
| 146 | + $client = new $classname($client, $context, $view, $templatePaths, $path); |
|
| 147 | 147 | |
| 148 | - if( !( $client instanceof $iface ) ) { |
|
| 149 | - throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Class "%1$s" does not implement "%2$s"', $classname, $iface ), 404 ); |
|
| 148 | + if (!($client instanceof $iface)) { |
|
| 149 | + throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Class "%1$s" does not implement "%2$s"', $classname, $iface), 404); |
|
| 150 | 150 | } |
| 151 | 151 | } |
| 152 | 152 | |
@@ -165,21 +165,21 @@ discard block |
||
| 165 | 165 | * @param string $path Name of the client separated by slashes, e.g "product/stock" |
| 166 | 166 | * @return \Aimeos\Admin\JsonAdm\Common\Iface Client object |
| 167 | 167 | */ |
| 168 | - protected static function createClientBase( $classname, $interface, \Aimeos\MShop\Context\Item\Iface $context, |
|
| 169 | - \Aimeos\MW\View\Iface $view, array $templatePaths, $path ) |
|
| 168 | + protected static function createClientBase($classname, $interface, \Aimeos\MShop\Context\Item\Iface $context, |
|
| 169 | + \Aimeos\MW\View\Iface $view, array $templatePaths, $path) |
|
| 170 | 170 | { |
| 171 | - if( isset( self::$objects[$classname] ) ) { |
|
| 171 | + if (isset(self::$objects[$classname])) { |
|
| 172 | 172 | return self::$objects[$classname]; |
| 173 | 173 | } |
| 174 | 174 | |
| 175 | - if( class_exists( $classname ) === false ) { |
|
| 176 | - throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Class "%1$s" not found', $classname ), 404 ); |
|
| 175 | + if (class_exists($classname) === false) { |
|
| 176 | + throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Class "%1$s" not found', $classname), 404); |
|
| 177 | 177 | } |
| 178 | 178 | |
| 179 | - $client = new $classname( $context, $view, $templatePaths, $path ); |
|
| 179 | + $client = new $classname($context, $view, $templatePaths, $path); |
|
| 180 | 180 | |
| 181 | - if( !( $client instanceof $interface ) ) { |
|
| 182 | - throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Class "%1$s" does not implement "%2$s"', $classname, $interface ), 500 ); |
|
| 181 | + if (!($client instanceof $interface)) { |
|
| 182 | + throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Class "%1$s" does not implement "%2$s"', $classname, $interface), 500); |
|
| 183 | 183 | } |
| 184 | 184 | |
| 185 | 185 | return $client; |
@@ -107,20 +107,20 @@ |
||
| 107 | 107 | * @param array $include List of resource types that should be fetched |
| 108 | 108 | * @return array List of items implementing \Aimeos\MShop\Common\Item\Iface |
| 109 | 109 | */ |
| 110 | - protected function getChildItems( array $items, array $include ) |
|
| 110 | + protected function getChildItems(array $items, array $include) |
|
| 111 | 111 | { |
| 112 | 112 | $list = []; |
| 113 | - $ids = array_keys( $items ); |
|
| 114 | - $include = array_intersect( $include, array( 'coupon/code' ) ); |
|
| 113 | + $ids = array_keys($items); |
|
| 114 | + $include = array_intersect($include, array('coupon/code')); |
|
| 115 | 115 | |
| 116 | - foreach( $include as $type ) |
|
| 116 | + foreach ($include as $type) |
|
| 117 | 117 | { |
| 118 | - $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), $type ); |
|
| 118 | + $manager = \Aimeos\MShop\Factory::createManager($this->getContext(), $type); |
|
| 119 | 119 | |
| 120 | 120 | $search = $manager->createSearch(); |
| 121 | - $search->setConditions( $search->compare( '==', str_replace( '/', '.', $type ) . '.parentid', $ids ) ); |
|
| 121 | + $search->setConditions($search->compare('==', str_replace('/', '.', $type) . '.parentid', $ids)); |
|
| 122 | 122 | |
| 123 | - $list = array_merge( $list, $manager->searchItems( $search ) ); |
|
| 123 | + $list = array_merge($list, $manager->searchItems($search)); |
|
| 124 | 124 | } |
| 125 | 125 | |
| 126 | 126 | return $list; |