@@ -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,88 +47,88 @@ 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 | - $helper = new \Aimeos\MW\View\Helper\Access\All( $view ); |
|
| 108 | - $view->addHelper( 'access', $helper ); |
|
| 107 | + $helper = new \Aimeos\MW\View\Helper\Access\All($view); |
|
| 108 | + $view->addHelper('access', $helper); |
|
| 109 | 109 | |
| 110 | - $trans = new \Aimeos\MW\Translation\None( 'de_DE' ); |
|
| 111 | - $helper = new \Aimeos\MW\View\Helper\Translate\Standard( $view, $trans ); |
|
| 112 | - $view->addHelper( 'translate', $helper ); |
|
| 110 | + $trans = new \Aimeos\MW\Translation\None('de_DE'); |
|
| 111 | + $helper = new \Aimeos\MW\View\Helper\Translate\Standard($view, $trans); |
|
| 112 | + $view->addHelper('translate', $helper); |
|
| 113 | 113 | |
| 114 | - $helper = new \Aimeos\MW\View\Helper\Url\Standard( $view, 'http://baseurl' ); |
|
| 115 | - $view->addHelper( 'url', $helper ); |
|
| 114 | + $helper = new \Aimeos\MW\View\Helper\Url\Standard($view, 'http://baseurl'); |
|
| 115 | + $view->addHelper('url', $helper); |
|
| 116 | 116 | |
| 117 | - $helper = new \Aimeos\MW\View\Helper\Number\Standard( $view, '.', '' ); |
|
| 118 | - $view->addHelper( 'number', $helper ); |
|
| 117 | + $helper = new \Aimeos\MW\View\Helper\Number\Standard($view, '.', ''); |
|
| 118 | + $view->addHelper('number', $helper); |
|
| 119 | 119 | |
| 120 | - $helper = new \Aimeos\MW\View\Helper\Date\Standard( $view, 'Y-m-d' ); |
|
| 121 | - $view->addHelper( 'date', $helper ); |
|
| 120 | + $helper = new \Aimeos\MW\View\Helper\Date\Standard($view, 'Y-m-d'); |
|
| 121 | + $view->addHelper('date', $helper); |
|
| 122 | 122 | |
| 123 | - $config = new \Aimeos\MW\Config\Decorator\Protect( $config, array( 'admin/jsonadm' ) ); |
|
| 124 | - $helper = new \Aimeos\MW\View\Helper\Config\Standard( $view, $config ); |
|
| 125 | - $view->addHelper( 'config', $helper ); |
|
| 123 | + $config = new \Aimeos\MW\Config\Decorator\Protect($config, array('admin/jsonadm')); |
|
| 124 | + $helper = new \Aimeos\MW\View\Helper\Config\Standard($view, $config); |
|
| 125 | + $view->addHelper('config', $helper); |
|
| 126 | 126 | |
| 127 | - $helper = new \Aimeos\MW\View\Helper\Request\Standard( $view, new \Zend\Diactoros\ServerRequest() ); |
|
| 128 | - $view->addHelper( 'request', $helper ); |
|
| 127 | + $helper = new \Aimeos\MW\View\Helper\Request\Standard($view, new \Zend\Diactoros\ServerRequest()); |
|
| 128 | + $view->addHelper('request', $helper); |
|
| 129 | 129 | |
| 130 | - $helper = new \Aimeos\MW\View\Helper\Response\Standard( $view, new \Zend\Diactoros\Response() ); |
|
| 131 | - $view->addHelper( 'response', $helper ); |
|
| 130 | + $helper = new \Aimeos\MW\View\Helper\Response\Standard($view, new \Zend\Diactoros\Response()); |
|
| 131 | + $view->addHelper('response', $helper); |
|
| 132 | 132 | |
| 133 | 133 | return $view; |
| 134 | 134 | } |
@@ -33,11 +33,11 @@ discard block |
||
| 33 | 33 | * @param integer $id Context ID the objects have been created with (string of \Aimeos\MShop\Context\Item\Iface) |
| 34 | 34 | * @param string $path Path describing the client to clear, e.g. "product/lists/type" |
| 35 | 35 | */ |
| 36 | - static public function clear( $id = null, $path = null ) |
|
| 36 | + static public function clear($id = null, $path = null) |
|
| 37 | 37 | { |
| 38 | - if( $id !== null ) |
|
| 38 | + if ($id !== null) |
|
| 39 | 39 | { |
| 40 | - if( $path !== null ) { |
|
| 40 | + if ($path !== null) { |
|
| 41 | 41 | self::$clients[$id][$path] = null; |
| 42 | 42 | } else { |
| 43 | 43 | self::$clients[$id] = []; |
@@ -65,18 +65,18 @@ discard block |
||
| 65 | 65 | * @return \Aimeos\Admin\JsonAdm\Iface JSON admin instance |
| 66 | 66 | * @throws \Aimeos\Admin\JsonAdm\Exception If the given path is invalid |
| 67 | 67 | */ |
| 68 | - static public function createClient( \Aimeos\MShop\Context\Item\Iface $context, |
|
| 69 | - array $templatePaths, $path, $name = null ) |
|
| 68 | + static public function createClient(\Aimeos\MShop\Context\Item\Iface $context, |
|
| 69 | + array $templatePaths, $path, $name = null) |
|
| 70 | 70 | { |
| 71 | - $path = strtolower( trim( $path, "/ \n\t\r\0\x0B" ) ); |
|
| 71 | + $path = strtolower(trim($path, "/ \n\t\r\0\x0B")); |
|
| 72 | 72 | $id = (string) $context; |
| 73 | 73 | |
| 74 | - if( self::$cache === false || !isset( self::$clients[$id][$path] ) ) |
|
| 74 | + if (self::$cache === false || !isset(self::$clients[$id][$path])) |
|
| 75 | 75 | { |
| 76 | - if( empty( $path ) ) { |
|
| 77 | - self::$clients[$id][$path] = self::createClientRoot( $context, $templatePaths, $path, $name ); |
|
| 76 | + if (empty($path)) { |
|
| 77 | + self::$clients[$id][$path] = self::createClientRoot($context, $templatePaths, $path, $name); |
|
| 78 | 78 | } else { |
| 79 | - self::$clients[$id][$path] = self::createClientNew( $context, $templatePaths, $path, $name ); |
|
| 79 | + self::$clients[$id][$path] = self::createClientNew($context, $templatePaths, $path, $name); |
|
| 80 | 80 | } |
| 81 | 81 | } |
| 82 | 82 | |
@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | * @param boolean $value True to enable caching, false to disable it. |
| 91 | 91 | * @return boolean Previous cache setting |
| 92 | 92 | */ |
| 93 | - static public function setCache( $value ) |
|
| 93 | + static public function setCache($value) |
|
| 94 | 94 | { |
| 95 | 95 | $old = self::$cache; |
| 96 | 96 | self::$cache = (boolean) $value; |
@@ -109,52 +109,52 @@ discard block |
||
| 109 | 109 | * @return \Aimeos\Admin\JsonAdm\Iface JSON admin instance |
| 110 | 110 | * @throws \Aimeos\Admin\JsonAdm\Exception If the given path is invalid |
| 111 | 111 | */ |
| 112 | - protected static function createClientNew( \Aimeos\MShop\Context\Item\Iface $context, |
|
| 113 | - array $templatePaths, $path, $name ) |
|
| 112 | + protected static function createClientNew(\Aimeos\MShop\Context\Item\Iface $context, |
|
| 113 | + array $templatePaths, $path, $name) |
|
| 114 | 114 | { |
| 115 | 115 | $view = $context->getView(); |
| 116 | 116 | $config = $context->getConfig(); |
| 117 | 117 | |
| 118 | - if( $view->access( $config->get( 'admin/jsonadm/access/' . $path . '/groups', [] ) ) !== true ) { |
|
| 119 | - throw new \Aimeos\Admin\JQAdm\Exception( sprintf( 'Not allowed to access JQAdm "%1$s" client', $path ) ); |
|
| 118 | + if ($view->access($config->get('admin/jsonadm/access/' . $path . '/groups', [])) !== true) { |
|
| 119 | + throw new \Aimeos\Admin\JQAdm\Exception(sprintf('Not allowed to access JQAdm "%1$s" client', $path)); |
|
| 120 | 120 | } |
| 121 | 121 | |
| 122 | 122 | |
| 123 | 123 | $pname = $name; |
| 124 | - $parts = explode( '/', $path ); |
|
| 124 | + $parts = explode('/', $path); |
|
| 125 | 125 | |
| 126 | - foreach( $parts as $key => $part ) |
|
| 126 | + foreach ($parts as $key => $part) |
|
| 127 | 127 | { |
| 128 | - if( ctype_alnum( $part ) === false ) |
|
| 128 | + if (ctype_alnum($part) === false) |
|
| 129 | 129 | { |
| 130 | - $msg = sprintf( 'Invalid client "%1$s" in "%2$s"', $part, $path ); |
|
| 131 | - throw new \Aimeos\Admin\JsonAdm\Exception( $msg, 400 ); |
|
| 130 | + $msg = sprintf('Invalid client "%1$s" in "%2$s"', $part, $path); |
|
| 131 | + throw new \Aimeos\Admin\JsonAdm\Exception($msg, 400); |
|
| 132 | 132 | } |
| 133 | 133 | |
| 134 | - $parts[$key] = ucwords( $part ); |
|
| 134 | + $parts[$key] = ucwords($part); |
|
| 135 | 135 | } |
| 136 | 136 | |
| 137 | - if( $pname === null ) { |
|
| 138 | - $pname = $context->getConfig()->get( 'admin/jsonadm/' . $path . '/name', 'Standard' ); |
|
| 137 | + if ($pname === null) { |
|
| 138 | + $pname = $context->getConfig()->get('admin/jsonadm/' . $path . '/name', 'Standard'); |
|
| 139 | 139 | } |
| 140 | 140 | |
| 141 | 141 | |
| 142 | 142 | $view = $context->getView(); |
| 143 | 143 | $iface = '\\Aimeos\\Admin\\JsonAdm\\Iface'; |
| 144 | - $classname = '\\Aimeos\\Admin\\JsonAdm\\' . join( '\\', $parts ) . '\\' . $pname; |
|
| 144 | + $classname = '\\Aimeos\\Admin\\JsonAdm\\' . join('\\', $parts) . '\\' . $pname; |
|
| 145 | 145 | |
| 146 | - if( ctype_alnum( $pname ) === false ) |
|
| 146 | + if (ctype_alnum($pname) === false) |
|
| 147 | 147 | { |
| 148 | - $classname = is_string( $pname ) ? $classname : '<not a string>'; |
|
| 149 | - throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Invalid class name "%1$s"', $classname ) ); |
|
| 148 | + $classname = is_string($pname) ? $classname : '<not a string>'; |
|
| 149 | + throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Invalid class name "%1$s"', $classname)); |
|
| 150 | 150 | } |
| 151 | 151 | |
| 152 | - if( class_exists( $classname ) === false ) { |
|
| 153 | - return self::createClientRoot( $context, $templatePaths, $path, $name ); |
|
| 152 | + if (class_exists($classname) === false) { |
|
| 153 | + return self::createClientRoot($context, $templatePaths, $path, $name); |
|
| 154 | 154 | } |
| 155 | 155 | |
| 156 | - $client = self::createClientBase( $classname, $iface, $context, $view, $templatePaths, $path ); |
|
| 157 | - return self::addClientDecorators( $client, $context, $view, $templatePaths, $path ); |
|
| 156 | + $client = self::createClientBase($classname, $iface, $context, $view, $templatePaths, $path); |
|
| 157 | + return self::addClientDecorators($client, $context, $view, $templatePaths, $path); |
|
| 158 | 158 | } |
| 159 | 159 | |
| 160 | 160 | |
@@ -168,8 +168,8 @@ discard block |
||
| 168 | 168 | * @return \Aimeos\Admin\JsonAdm\Iface JSON admin instance |
| 169 | 169 | * @throws \Aimeos\Admin\JsonAdm\Exception If the client couldn't be created |
| 170 | 170 | */ |
| 171 | - protected static function createClientRoot( \Aimeos\MShop\Context\Item\Iface $context, |
|
| 172 | - array $templatePaths, $path, $name = null ) |
|
| 171 | + protected static function createClientRoot(\Aimeos\MShop\Context\Item\Iface $context, |
|
| 172 | + array $templatePaths, $path, $name = null) |
|
| 173 | 173 | { |
| 174 | 174 | /** admin/jsonadm/name |
| 175 | 175 | * Class name of the used JSON API client implementation |
@@ -204,21 +204,21 @@ discard block |
||
| 204 | 204 | * @since 2015.12 |
| 205 | 205 | * @category Developer |
| 206 | 206 | */ |
| 207 | - if( $name === null ) { |
|
| 208 | - $name = $context->getConfig()->get( 'admin/jsonadm/name', 'Standard' ); |
|
| 207 | + if ($name === null) { |
|
| 208 | + $name = $context->getConfig()->get('admin/jsonadm/name', 'Standard'); |
|
| 209 | 209 | } |
| 210 | 210 | |
| 211 | - if( ctype_alnum( $name ) === false ) |
|
| 211 | + if (ctype_alnum($name) === false) |
|
| 212 | 212 | { |
| 213 | - $classname = is_string( $name ) ? '\\Aimeos\\Admin\\JsonAdm\\' . $name : '<not a string>'; |
|
| 214 | - throw new \Aimeos\Admin\JsonAdm\Exception( sprintf( 'Invalid class name "%1$s"', $classname ) ); |
|
| 213 | + $classname = is_string($name) ? '\\Aimeos\\Admin\\JsonAdm\\' . $name : '<not a string>'; |
|
| 214 | + throw new \Aimeos\Admin\JsonAdm\Exception(sprintf('Invalid class name "%1$s"', $classname)); |
|
| 215 | 215 | } |
| 216 | 216 | |
| 217 | 217 | $view = $context->getView(); |
| 218 | 218 | $iface = '\\Aimeos\\Admin\\JsonAdm\\Iface'; |
| 219 | 219 | $classname = '\\Aimeos\\Admin\\JsonAdm\\' . $name; |
| 220 | 220 | |
| 221 | - $client = self::createClientBase( $classname, $iface, $context, $view, $templatePaths, $path ); |
|
| 221 | + $client = self::createClientBase($classname, $iface, $context, $view, $templatePaths, $path); |
|
| 222 | 222 | |
| 223 | 223 | /** admin/jsonadm/decorators/excludes |
| 224 | 224 | * Excludes decorators added by the "common" option from the JSON API clients |
@@ -298,6 +298,6 @@ discard block |
||
| 298 | 298 | * @see admin/jsonadm/decorators/global |
| 299 | 299 | */ |
| 300 | 300 | |
| 301 | - return self::addClientDecorators( $client, $context, $view, $templatePaths, $path ); |
|
| 301 | + return self::addClientDecorators($client, $context, $view, $templatePaths, $path); |
|
| 302 | 302 | } |
| 303 | 303 | } |