@@ -39,8 +39,7 @@ |
||
| 39 | 39 | |
| 40 | 40 | $i18n = app('\Aimeos\Shop\Base\I18n')->get( array( $locale ) ); |
| 41 | 41 | $translation = $i18n[$locale]; |
| 42 | - } |
|
| 43 | - else |
|
| 42 | + } else |
|
| 44 | 43 | { |
| 45 | 44 | $translation = new \Aimeos\MW\Translation\None( 'en' ); |
| 46 | 45 | } |
@@ -32,51 +32,51 @@ discard block |
||
| 32 | 32 | * @param string|null $locale Code of the current language or null for no translation |
| 33 | 33 | * @return \Aimeos\MW\View\Iface View object |
| 34 | 34 | */ |
| 35 | - public function create( \Aimeos\MW\Config\Iface $config, array $templatePaths, $locale = null ) |
|
| 35 | + public function create(\Aimeos\MW\Config\Iface $config, array $templatePaths, $locale = null) |
|
| 36 | 36 | { |
| 37 | 37 | $params = $fixed = array(); |
| 38 | 38 | |
| 39 | - if( $locale !== null ) |
|
| 39 | + if ($locale !== null) |
|
| 40 | 40 | { |
| 41 | 41 | $params = Route::current()->parameters() + Input::all(); |
| 42 | 42 | $fixed = $this->getFixedParams(); |
| 43 | 43 | |
| 44 | - $i18n = app('\Aimeos\Shop\Base\I18n')->get( array( $locale ) ); |
|
| 44 | + $i18n = app('\Aimeos\Shop\Base\I18n')->get(array($locale)); |
|
| 45 | 45 | $translation = $i18n[$locale]; |
| 46 | 46 | } |
| 47 | 47 | else |
| 48 | 48 | { |
| 49 | - $translation = new \Aimeos\MW\Translation\None( 'en' ); |
|
| 49 | + $translation = new \Aimeos\MW\Translation\None('en'); |
|
| 50 | 50 | } |
| 51 | 51 | |
| 52 | 52 | |
| 53 | - $view = new \Aimeos\MW\View\Standard( $templatePaths ); |
|
| 53 | + $view = new \Aimeos\MW\View\Standard($templatePaths); |
|
| 54 | 54 | |
| 55 | - $helper = new \Aimeos\MW\View\Helper\Translate\Standard( $view, $translation ); |
|
| 56 | - $view->addHelper( 'translate', $helper ); |
|
| 55 | + $helper = new \Aimeos\MW\View\Helper\Translate\Standard($view, $translation); |
|
| 56 | + $view->addHelper('translate', $helper); |
|
| 57 | 57 | |
| 58 | - $helper = new \Aimeos\MW\View\Helper\Url\Laravel5( $view, app('url'), $fixed ); |
|
| 59 | - $view->addHelper( 'url', $helper ); |
|
| 58 | + $helper = new \Aimeos\MW\View\Helper\Url\Laravel5($view, app('url'), $fixed); |
|
| 59 | + $view->addHelper('url', $helper); |
|
| 60 | 60 | |
| 61 | - $helper = new \Aimeos\MW\View\Helper\Param\Standard( $view, $params ); |
|
| 62 | - $view->addHelper( 'param', $helper ); |
|
| 61 | + $helper = new \Aimeos\MW\View\Helper\Param\Standard($view, $params); |
|
| 62 | + $view->addHelper('param', $helper); |
|
| 63 | 63 | |
| 64 | - $helper = new \Aimeos\MW\View\Helper\Config\Standard( $view, $config ); |
|
| 65 | - $view->addHelper( 'config', $helper ); |
|
| 64 | + $helper = new \Aimeos\MW\View\Helper\Config\Standard($view, $config); |
|
| 65 | + $view->addHelper('config', $helper); |
|
| 66 | 66 | |
| 67 | - $sepDec = $config->get( 'client/html/common/format/seperatorDecimal', '.' ); |
|
| 68 | - $sep1000 = $config->get( 'client/html/common/format/seperator1000', ' ' ); |
|
| 69 | - $helper = new \Aimeos\MW\View\Helper\Number\Standard( $view, $sepDec, $sep1000 ); |
|
| 70 | - $view->addHelper( 'number', $helper ); |
|
| 67 | + $sepDec = $config->get('client/html/common/format/seperatorDecimal', '.'); |
|
| 68 | + $sep1000 = $config->get('client/html/common/format/seperator1000', ' '); |
|
| 69 | + $helper = new \Aimeos\MW\View\Helper\Number\Standard($view, $sepDec, $sep1000); |
|
| 70 | + $view->addHelper('number', $helper); |
|
| 71 | 71 | |
| 72 | - $helper = new \Aimeos\MW\View\Helper\Request\Laravel5( $view, Request::instance() ); |
|
| 73 | - $view->addHelper( 'request', $helper ); |
|
| 72 | + $helper = new \Aimeos\MW\View\Helper\Request\Laravel5($view, Request::instance()); |
|
| 73 | + $view->addHelper('request', $helper); |
|
| 74 | 74 | |
| 75 | - $helper = new \Aimeos\MW\View\Helper\Response\Laravel5( $view ); |
|
| 76 | - $view->addHelper( 'response', $helper ); |
|
| 75 | + $helper = new \Aimeos\MW\View\Helper\Response\Laravel5($view); |
|
| 76 | + $view->addHelper('response', $helper); |
|
| 77 | 77 | |
| 78 | - $helper = new \Aimeos\MW\View\Helper\Csrf\Standard( $view, '_token', csrf_token() ); |
|
| 79 | - $view->addHelper( 'csrf', $helper ); |
|
| 78 | + $helper = new \Aimeos\MW\View\Helper\Csrf\Standard($view, '_token', csrf_token()); |
|
| 79 | + $view->addHelper('csrf', $helper); |
|
| 80 | 80 | |
| 81 | 81 | return $view; |
| 82 | 82 | } |
@@ -91,15 +91,15 @@ discard block |
||
| 91 | 91 | { |
| 92 | 92 | $fixed = array(); |
| 93 | 93 | |
| 94 | - if( ( $value = Route::input( 'site' ) ) !== null ) { |
|
| 94 | + if (($value = Route::input('site')) !== null) { |
|
| 95 | 95 | $fixed['site'] = $value; |
| 96 | 96 | } |
| 97 | 97 | |
| 98 | - if( ( $value = Route::input( 'locale' ) ) !== null ) { |
|
| 98 | + if (($value = Route::input('locale')) !== null) { |
|
| 99 | 99 | $fixed['locale'] = $value; |
| 100 | 100 | } |
| 101 | 101 | |
| 102 | - if( ( $value = Route::input( 'currency' ) ) !== null ) { |
|
| 102 | + if (($value = Route::input('currency')) !== null) { |
|
| 103 | 103 | $fixed['currency'] = $value; |
| 104 | 104 | } |
| 105 | 105 | |
@@ -22,19 +22,19 @@ |
||
| 22 | 22 | * @param string|array $sites Unique site codes |
| 23 | 23 | * @return \Aimeos\MShop\Locale\Item\Site\Iface[] List of site items |
| 24 | 24 | */ |
| 25 | - protected function getSiteItems( \Aimeos\MShop\Context\Item\Iface $context, $sites ) |
|
| 25 | + protected function getSiteItems(\Aimeos\MShop\Context\Item\Iface $context, $sites) |
|
| 26 | 26 | { |
| 27 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'locale/site' ); |
|
| 27 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'locale/site'); |
|
| 28 | 28 | $search = $manager->createSearch(); |
| 29 | 29 | |
| 30 | - if( is_scalar( $sites ) && $sites != '' ) { |
|
| 31 | - $sites = explode( ' ', $sites ); |
|
| 30 | + if (is_scalar($sites) && $sites != '') { |
|
| 31 | + $sites = explode(' ', $sites); |
|
| 32 | 32 | } |
| 33 | 33 | |
| 34 | - if( !empty( $sites ) ) { |
|
| 35 | - $search->setConditions( $search->compare( '==', 'locale.site.code', $sites ) ); |
|
| 34 | + if (!empty($sites)) { |
|
| 35 | + $search->setConditions($search->compare('==', 'locale.site.code', $sites)); |
|
| 36 | 36 | } |
| 37 | 37 | |
| 38 | - return $manager->searchItems( $search ); |
|
| 38 | + return $manager->searchItems($search); |
|
| 39 | 39 | } |
| 40 | 40 | } |
| 41 | 41 | \ No newline at end of file |
@@ -35,24 +35,24 @@ discard block |
||
| 35 | 35 | */ |
| 36 | 36 | public function fire() |
| 37 | 37 | { |
| 38 | - $context = $this->getLaravel()->make( 'Aimeos\Shop\Base\Context' )->get( false ); |
|
| 39 | - $context->setEditor( 'aimeos:cache' ); |
|
| 38 | + $context = $this->getLaravel()->make('Aimeos\Shop\Base\Context')->get(false); |
|
| 39 | + $context->setEditor('aimeos:cache'); |
|
| 40 | 40 | |
| 41 | - $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context ); |
|
| 41 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context); |
|
| 42 | 42 | |
| 43 | - foreach( $this->getSiteItems( $context, $this->argument( 'site' ) ) as $siteItem ) |
|
| 43 | + foreach ($this->getSiteItems($context, $this->argument('site')) as $siteItem) |
|
| 44 | 44 | { |
| 45 | - $localeItem = $localeManager->bootstrap( $siteItem->getCode(), '', '', false ); |
|
| 45 | + $localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false); |
|
| 46 | 46 | |
| 47 | 47 | $lcontext = clone $context; |
| 48 | - $lcontext->setLocale( $localeItem ); |
|
| 48 | + $lcontext->setLocale($localeItem); |
|
| 49 | 49 | |
| 50 | - $cache = new \Aimeos\MAdmin\Cache\Proxy\Standard( $lcontext ); |
|
| 51 | - $lcontext->setCache( $cache ); |
|
| 50 | + $cache = new \Aimeos\MAdmin\Cache\Proxy\Standard($lcontext); |
|
| 51 | + $lcontext->setCache($cache); |
|
| 52 | 52 | |
| 53 | - $this->info( sprintf( 'Clearing the Aimeos cache for site "%1$s"', $siteItem->getCode() ) ); |
|
| 53 | + $this->info(sprintf('Clearing the Aimeos cache for site "%1$s"', $siteItem->getCode())); |
|
| 54 | 54 | |
| 55 | - \Aimeos\MAdmin\Cache\Manager\Factory::createManager( $lcontext )->getCache()->flush(); |
|
| 55 | + \Aimeos\MAdmin\Cache\Manager\Factory::createManager($lcontext)->getCache()->flush(); |
|
| 56 | 56 | } |
| 57 | 57 | } |
| 58 | 58 | |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | protected function getArguments() |
| 66 | 66 | { |
| 67 | 67 | return array( |
| 68 | - array( 'site', InputArgument::OPTIONAL, 'Site codes to clear the cache like "default unittest" (none for all)' ), |
|
| 68 | + array('site', InputArgument::OPTIONAL, 'Site codes to clear the cache like "default unittest" (none for all)'), |
|
| 69 | 69 | ); |
| 70 | 70 | } |
| 71 | 71 | |
@@ -35,18 +35,18 @@ discard block |
||
| 35 | 35 | * @param string $classname Name of the setup task class |
| 36 | 36 | * @return boolean True if class is found, false if not |
| 37 | 37 | */ |
| 38 | - public static function autoload( $classname ) |
|
| 38 | + public static function autoload($classname) |
|
| 39 | 39 | { |
| 40 | - if( strncmp( $classname, 'Aimeos\\MW\\Setup\\Task\\', 21 ) === 0 ) |
|
| 40 | + if (strncmp($classname, 'Aimeos\\MW\\Setup\\Task\\', 21) === 0) |
|
| 41 | 41 | { |
| 42 | - $fileName = substr( $classname, 21 ) . '.php'; |
|
| 43 | - $paths = explode( PATH_SEPARATOR, get_include_path() ); |
|
| 42 | + $fileName = substr($classname, 21) . '.php'; |
|
| 43 | + $paths = explode(PATH_SEPARATOR, get_include_path()); |
|
| 44 | 44 | |
| 45 | - foreach( $paths as $path ) |
|
| 45 | + foreach ($paths as $path) |
|
| 46 | 46 | { |
| 47 | 47 | $file = $path . DIRECTORY_SEPARATOR . $fileName; |
| 48 | 48 | |
| 49 | - if( file_exists( $file ) === true && ( include_once $file ) !== false ) { |
|
| 49 | + if (file_exists($file) === true && (include_once $file) !== false) { |
|
| 50 | 50 | return true; |
| 51 | 51 | } |
| 52 | 52 | } |
@@ -63,33 +63,33 @@ discard block |
||
| 63 | 63 | */ |
| 64 | 64 | public function fire() |
| 65 | 65 | { |
| 66 | - $ctx = $this->getLaravel()->make( '\Aimeos\Shop\Base\Context' )->get( false ); |
|
| 67 | - $ctx->setEditor( 'aimeos:setup' ); |
|
| 66 | + $ctx = $this->getLaravel()->make('\Aimeos\Shop\Base\Context')->get(false); |
|
| 67 | + $ctx->setEditor('aimeos:setup'); |
|
| 68 | 68 | |
| 69 | 69 | $config = $ctx->getConfig(); |
| 70 | - $site = $this->argument( 'site' ); |
|
| 71 | - $template = $this->argument( 'tplsite' ); |
|
| 70 | + $site = $this->argument('site'); |
|
| 71 | + $template = $this->argument('tplsite'); |
|
| 72 | 72 | |
| 73 | - $config->set( 'setup/site', $site ); |
|
| 74 | - $dbconfig = $this->getDbConfig( $config ); |
|
| 75 | - $this->setOptions( $config ); |
|
| 73 | + $config->set('setup/site', $site); |
|
| 74 | + $dbconfig = $this->getDbConfig($config); |
|
| 75 | + $this->setOptions($config); |
|
| 76 | 76 | |
| 77 | - $taskPaths = $this->getLaravel()->make( '\Aimeos\Shop\Base\Aimeos' )->get()->getSetupPaths( $template ); |
|
| 77 | + $taskPaths = $this->getLaravel()->make('\Aimeos\Shop\Base\Aimeos')->get()->getSetupPaths($template); |
|
| 78 | 78 | |
| 79 | 79 | $includePaths = $taskPaths; |
| 80 | 80 | $includePaths[] = get_include_path(); |
| 81 | 81 | |
| 82 | - if( set_include_path( implode( PATH_SEPARATOR, $includePaths ) ) === false ) { |
|
| 83 | - throw new Exception( 'Unable to extend include path' ); |
|
| 82 | + if (set_include_path(implode(PATH_SEPARATOR, $includePaths)) === false) { |
|
| 83 | + throw new Exception('Unable to extend include path'); |
|
| 84 | 84 | } |
| 85 | 85 | |
| 86 | - spl_autoload_register( '\Aimeos\Shop\Command\SetupCommand::autoload', true ); |
|
| 86 | + spl_autoload_register('\Aimeos\Shop\Command\SetupCommand::autoload', true); |
|
| 87 | 87 | |
| 88 | - $manager = new \Aimeos\MW\Setup\Manager\Multiple( $ctx->getDatabaseManager(), $dbconfig, $taskPaths, $ctx ); |
|
| 88 | + $manager = new \Aimeos\MW\Setup\Manager\Multiple($ctx->getDatabaseManager(), $dbconfig, $taskPaths, $ctx); |
|
| 89 | 89 | |
| 90 | - $this->info( sprintf( 'Initializing or updating the Aimeos database tables for site "%1$s"', $site ) ); |
|
| 90 | + $this->info(sprintf('Initializing or updating the Aimeos database tables for site "%1$s"', $site)); |
|
| 91 | 91 | |
| 92 | - $manager->run( 'mysql' ); |
|
| 92 | + $manager->run('mysql'); |
|
| 93 | 93 | } |
| 94 | 94 | |
| 95 | 95 | |
@@ -101,8 +101,8 @@ discard block |
||
| 101 | 101 | protected function getArguments() |
| 102 | 102 | { |
| 103 | 103 | return array( |
| 104 | - array( 'site', InputArgument::OPTIONAL, 'Site for updating database entries', 'default' ), |
|
| 105 | - array( 'tplsite', InputArgument::OPTIONAL, 'Site used as template for creating the new one', 'default' ), |
|
| 104 | + array('site', InputArgument::OPTIONAL, 'Site for updating database entries', 'default'), |
|
| 105 | + array('tplsite', InputArgument::OPTIONAL, 'Site used as template for creating the new one', 'default'), |
|
| 106 | 106 | ); |
| 107 | 107 | } |
| 108 | 108 | |
@@ -115,7 +115,7 @@ discard block |
||
| 115 | 115 | protected function getOptions() |
| 116 | 116 | { |
| 117 | 117 | return array( |
| 118 | - array( 'option', null, InputOption::VALUE_REQUIRED, 'Optional setup configuration, name and value are separated by ":" like "setup/default/demo:1"', array() ), |
|
| 118 | + array('option', null, InputOption::VALUE_REQUIRED, 'Optional setup configuration, name and value are separated by ":" like "setup/default/demo:1"', array()), |
|
| 119 | 119 | ); |
| 120 | 120 | } |
| 121 | 121 | |
@@ -126,14 +126,14 @@ discard block |
||
| 126 | 126 | * @param \Aimeos\MW\Config\Iface $conf Config object |
| 127 | 127 | * @return array Multi-dimensional associative list of database configuration parameters |
| 128 | 128 | */ |
| 129 | - protected function getDbConfig( \Aimeos\MW\Config\Iface $conf ) |
|
| 129 | + protected function getDbConfig(\Aimeos\MW\Config\Iface $conf) |
|
| 130 | 130 | { |
| 131 | - $dbconfig = $conf->get( 'resource', array() ); |
|
| 131 | + $dbconfig = $conf->get('resource', array()); |
|
| 132 | 132 | |
| 133 | - foreach( $dbconfig as $rname => $dbconf ) |
|
| 133 | + foreach ($dbconfig as $rname => $dbconf) |
|
| 134 | 134 | { |
| 135 | - if( strncmp( $rname, 'db', 2 ) !== 0 ) { |
|
| 136 | - unset( $dbconfig[$rname] ); |
|
| 135 | + if (strncmp($rname, 'db', 2) !== 0) { |
|
| 136 | + unset($dbconfig[$rname]); |
|
| 137 | 137 | } |
| 138 | 138 | } |
| 139 | 139 | |
@@ -148,12 +148,12 @@ discard block |
||
| 148 | 148 | * @param array Associative list of database configurations |
| 149 | 149 | * @throws \RuntimeException If the format of the options is invalid |
| 150 | 150 | */ |
| 151 | - protected function setOptions( \Aimeos\MW\Config\Iface $conf ) |
|
| 151 | + protected function setOptions(\Aimeos\MW\Config\Iface $conf) |
|
| 152 | 152 | { |
| 153 | - foreach( (array) $this->option( 'option' ) as $option ) |
|
| 153 | + foreach ((array) $this->option('option') as $option) |
|
| 154 | 154 | { |
| 155 | - list( $name, $value ) = explode( ':', $option ); |
|
| 156 | - $conf->set( $name, $value ); |
|
| 155 | + list($name, $value) = explode(':', $option); |
|
| 156 | + $conf->set($name, $value); |
|
| 157 | 157 | } |
| 158 | 158 | } |
| 159 | 159 | } |
@@ -28,7 +28,7 @@ |
||
| 28 | 28 | */ |
| 29 | 29 | public function indexAction() |
| 30 | 30 | { |
| 31 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'basket-index' ); |
|
| 31 | + $params = app('\Aimeos\Shop\Base\Page')->getSections('basket-index'); |
|
| 32 | 32 | return \View::make('shop::basket.index', $params); |
| 33 | 33 | } |
| 34 | 34 | } |
| 35 | 35 | \ No newline at end of file |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | */ |
| 29 | 29 | public function countAction() |
| 30 | 30 | { |
| 31 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'catalog-count' ); |
|
| 31 | + $params = app('\Aimeos\Shop\Base\Page')->getSections('catalog-count'); |
|
| 32 | 32 | $contents = \View::make('shop::catalog.count', $params); |
| 33 | 33 | |
| 34 | 34 | $response = \Response::make($contents, 200); |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | */ |
| 46 | 46 | public function detailAction() |
| 47 | 47 | { |
| 48 | - $params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-detail' ); |
|
| 48 | + $params = app('Aimeos\Shop\Base\Page')->getSections('catalog-detail'); |
|
| 49 | 49 | return \View::make('shop::catalog.detail', $params); |
| 50 | 50 | } |
| 51 | 51 | |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | */ |
| 58 | 58 | public function listAction() |
| 59 | 59 | { |
| 60 | - $params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-list' ); |
|
| 60 | + $params = app('Aimeos\Shop\Base\Page')->getSections('catalog-list'); |
|
| 61 | 61 | return \View::make('shop::catalog.list', $params); |
| 62 | 62 | } |
| 63 | 63 | |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | */ |
| 70 | 70 | public function stockAction() |
| 71 | 71 | { |
| 72 | - $params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-stock' ); |
|
| 72 | + $params = app('Aimeos\Shop\Base\Page')->getSections('catalog-stock'); |
|
| 73 | 73 | $contents = \View::make('shop::catalog.stock', $params); |
| 74 | 74 | |
| 75 | 75 | $response = \Response::make($contents, 200); |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | */ |
| 87 | 87 | public function suggestAction() |
| 88 | 88 | { |
| 89 | - $params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-suggest' ); |
|
| 89 | + $params = app('Aimeos\Shop\Base\Page')->getSections('catalog-suggest'); |
|
| 90 | 90 | $contents = \View::make('shop::catalog.suggest', $params); |
| 91 | 91 | |
| 92 | 92 | $response = \Response::make($contents, 200); |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | */ |
| 29 | 29 | public function confirmAction() |
| 30 | 30 | { |
| 31 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'checkout-confirm' ); |
|
| 31 | + $params = app('\Aimeos\Shop\Base\Page')->getSections('checkout-confirm'); |
|
| 32 | 32 | return \View::make('shop::checkout.confirm', $params); |
| 33 | 33 | } |
| 34 | 34 | |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | */ |
| 41 | 41 | public function indexAction() |
| 42 | 42 | { |
| 43 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'checkout-index' ); |
|
| 43 | + $params = app('\Aimeos\Shop\Base\Page')->getSections('checkout-index'); |
|
| 44 | 44 | return \View::make('shop::checkout.index', $params); |
| 45 | 45 | } |
| 46 | 46 | |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | */ |
| 53 | 53 | public function updateAction() |
| 54 | 54 | { |
| 55 | - $params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'checkout-update' ); |
|
| 55 | + $params = app('\Aimeos\Shop\Base\Page')->getSections('checkout-update'); |
|
| 56 | 56 | return \View::make('shop::checkout.update', $params); |
| 57 | 57 | } |
| 58 | 58 | } |
| 59 | 59 | \ No newline at end of file |
@@ -207,8 +207,7 @@ |
||
| 207 | 207 | $localeItem = $localeManager->bootstrap( $sitecode, '', '', false ); |
| 208 | 208 | $localeItem->setLanguageId( null ); |
| 209 | 209 | $localeItem->setCurrencyId( null ); |
| 210 | - } |
|
| 211 | - catch( \Aimeos\MShop\Locale\Exception $e ) |
|
| 210 | + } catch( \Aimeos\MShop\Locale\Exception $e ) |
|
| 212 | 211 | { |
| 213 | 212 | $localeItem = $localeManager->createItem(); |
| 214 | 213 | } |
@@ -35,19 +35,19 @@ discard block |
||
| 35 | 35 | * @param \Illuminate\Http\Request $request Request object |
| 36 | 36 | * @return \Illuminate\Http\Response Response object containing the generated output |
| 37 | 37 | */ |
| 38 | - public function deleteAction( Request $request ) |
|
| 38 | + public function deleteAction(Request $request) |
|
| 39 | 39 | { |
| 40 | - if( config( 'shop.authorize', true ) ) { |
|
| 41 | - $this->authorize( 'admin' ); |
|
| 40 | + if (config('shop.authorize', true)) { |
|
| 41 | + $this->authorize('admin'); |
|
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | $status = 500; |
| 45 | 45 | $header = $request->headers->all(); |
| 46 | 46 | |
| 47 | 47 | $cntl = $this->createController(); |
| 48 | - $result = $cntl->delete( $request->getContent(), $header, $status ); |
|
| 48 | + $result = $cntl->delete($request->getContent(), $header, $status); |
|
| 49 | 49 | |
| 50 | - return $this->createResponse( $result, $status, $header ); |
|
| 50 | + return $this->createResponse($result, $status, $header); |
|
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | |
@@ -57,19 +57,19 @@ discard block |
||
| 57 | 57 | * @param \Illuminate\Http\Request $request Request object |
| 58 | 58 | * @return \Illuminate\Http\Response Response object containing the generated output |
| 59 | 59 | */ |
| 60 | - public function getAction( Request $request ) |
|
| 60 | + public function getAction(Request $request) |
|
| 61 | 61 | { |
| 62 | - if( config( 'shop.authorize', true ) ) { |
|
| 63 | - $this->authorize( 'admin' ); |
|
| 62 | + if (config('shop.authorize', true)) { |
|
| 63 | + $this->authorize('admin'); |
|
| 64 | 64 | } |
| 65 | 65 | |
| 66 | 66 | $status = 500; |
| 67 | 67 | $header = $request->headers->all(); |
| 68 | 68 | |
| 69 | 69 | $cntl = $this->createController(); |
| 70 | - $result = $cntl->get( $request->getContent(), $header, $status ); |
|
| 70 | + $result = $cntl->get($request->getContent(), $header, $status); |
|
| 71 | 71 | |
| 72 | - return $this->createResponse( $result, $status, $header ); |
|
| 72 | + return $this->createResponse($result, $status, $header); |
|
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | |
@@ -79,19 +79,19 @@ discard block |
||
| 79 | 79 | * @param \Illuminate\Http\Request $request Request object |
| 80 | 80 | * @return \Illuminate\Http\Response Response object containing the generated output |
| 81 | 81 | */ |
| 82 | - public function patchAction( Request $request ) |
|
| 82 | + public function patchAction(Request $request) |
|
| 83 | 83 | { |
| 84 | - if( config( 'shop.authorize', true ) ) { |
|
| 85 | - $this->authorize( 'admin' ); |
|
| 84 | + if (config('shop.authorize', true)) { |
|
| 85 | + $this->authorize('admin'); |
|
| 86 | 86 | } |
| 87 | 87 | |
| 88 | 88 | $status = 500; |
| 89 | 89 | $header = $request->headers->all(); |
| 90 | 90 | |
| 91 | 91 | $cntl = $this->createController(); |
| 92 | - $result = $cntl->patch( $request->getContent(), $header, $status ); |
|
| 92 | + $result = $cntl->patch($request->getContent(), $header, $status); |
|
| 93 | 93 | |
| 94 | - return $this->createResponse( $result, $status, $header ); |
|
| 94 | + return $this->createResponse($result, $status, $header); |
|
| 95 | 95 | } |
| 96 | 96 | |
| 97 | 97 | |
@@ -101,19 +101,19 @@ discard block |
||
| 101 | 101 | * @param \Illuminate\Http\Request $request Request object |
| 102 | 102 | * @return \Illuminate\Http\Response Response object containing the generated output |
| 103 | 103 | */ |
| 104 | - public function postAction( Request $request ) |
|
| 104 | + public function postAction(Request $request) |
|
| 105 | 105 | { |
| 106 | - if( config( 'shop.authorize', true ) ) { |
|
| 107 | - $this->authorize( 'admin' ); |
|
| 106 | + if (config('shop.authorize', true)) { |
|
| 107 | + $this->authorize('admin'); |
|
| 108 | 108 | } |
| 109 | 109 | |
| 110 | 110 | $status = 500; |
| 111 | 111 | $header = $request->headers->all(); |
| 112 | 112 | |
| 113 | 113 | $cntl = $this->createController(); |
| 114 | - $result = $cntl->post( $request->getContent(), $header, $status ); |
|
| 114 | + $result = $cntl->post($request->getContent(), $header, $status); |
|
| 115 | 115 | |
| 116 | - return $this->createResponse( $result, $status, $header ); |
|
| 116 | + return $this->createResponse($result, $status, $header); |
|
| 117 | 117 | } |
| 118 | 118 | |
| 119 | 119 | |
@@ -123,19 +123,19 @@ discard block |
||
| 123 | 123 | * @param \Illuminate\Http\Request $request Request object |
| 124 | 124 | * @return \Illuminate\Http\Response Response object containing the generated output |
| 125 | 125 | */ |
| 126 | - public function putAction( Request $request ) |
|
| 126 | + public function putAction(Request $request) |
|
| 127 | 127 | { |
| 128 | - if( config( 'shop.authorize', true ) ) { |
|
| 129 | - $this->authorize( 'admin' ); |
|
| 128 | + if (config('shop.authorize', true)) { |
|
| 129 | + $this->authorize('admin'); |
|
| 130 | 130 | } |
| 131 | 131 | |
| 132 | 132 | $status = 500; |
| 133 | 133 | $header = $request->headers->all(); |
| 134 | 134 | |
| 135 | 135 | $cntl = $this->createController(); |
| 136 | - $result = $cntl->put( $request->getContent(), $header, $status ); |
|
| 136 | + $result = $cntl->put($request->getContent(), $header, $status); |
|
| 137 | 137 | |
| 138 | - return $this->createResponse( $result, $status, $header ); |
|
| 138 | + return $this->createResponse($result, $status, $header); |
|
| 139 | 139 | } |
| 140 | 140 | |
| 141 | 141 | |
@@ -145,19 +145,19 @@ discard block |
||
| 145 | 145 | * @param \Illuminate\Http\Request $request Request object |
| 146 | 146 | * @return \Illuminate\Http\Response Response object containing the generated output |
| 147 | 147 | */ |
| 148 | - public function optionsAction( Request $request ) |
|
| 148 | + public function optionsAction(Request $request) |
|
| 149 | 149 | { |
| 150 | - if( config( 'shop.authorize', true ) ) { |
|
| 151 | - $this->authorize( 'admin' ); |
|
| 150 | + if (config('shop.authorize', true)) { |
|
| 151 | + $this->authorize('admin'); |
|
| 152 | 152 | } |
| 153 | 153 | |
| 154 | 154 | $status = 500; |
| 155 | 155 | $header = $request->headers->all(); |
| 156 | 156 | |
| 157 | 157 | $cntl = $this->createController(); |
| 158 | - $result = $cntl->options( $request->getContent(), $header, $status ); |
|
| 158 | + $result = $cntl->options($request->getContent(), $header, $status); |
|
| 159 | 159 | |
| 160 | - return $this->createResponse( $result, $status, $header ); |
|
| 160 | + return $this->createResponse($result, $status, $header); |
|
| 161 | 161 | } |
| 162 | 162 | |
| 163 | 163 | |
@@ -168,20 +168,20 @@ discard block |
||
| 168 | 168 | */ |
| 169 | 169 | protected function createController() |
| 170 | 170 | { |
| 171 | - $site = Route::input( 'site', Input::get( 'site', 'default' ) ); |
|
| 172 | - $lang = Input::get( 'lang', config( 'app.locale', 'en' ) ); |
|
| 173 | - $resource = Route::input( 'resource' ); |
|
| 171 | + $site = Route::input('site', Input::get('site', 'default')); |
|
| 172 | + $lang = Input::get('lang', config('app.locale', 'en')); |
|
| 173 | + $resource = Route::input('resource'); |
|
| 174 | 174 | |
| 175 | - $aimeos = app( '\Aimeos\Shop\Base\Aimeos' )->get(); |
|
| 176 | - $templatePaths = $aimeos->getCustomPaths( 'controller/jsonadm/templates' ); |
|
| 175 | + $aimeos = app('\Aimeos\Shop\Base\Aimeos')->get(); |
|
| 176 | + $templatePaths = $aimeos->getCustomPaths('controller/jsonadm/templates'); |
|
| 177 | 177 | |
| 178 | - $context = app( '\Aimeos\Shop\Base\Context' )->get( false ); |
|
| 179 | - $context = $this->setLocale( $context, $site, $lang ); |
|
| 178 | + $context = app('\Aimeos\Shop\Base\Context')->get(false); |
|
| 179 | + $context = $this->setLocale($context, $site, $lang); |
|
| 180 | 180 | |
| 181 | - $view = app( '\Aimeos\Shop\Base\View' )->create( $context->getConfig(), $templatePaths, $lang ); |
|
| 182 | - $context->setView( $view ); |
|
| 181 | + $view = app('\Aimeos\Shop\Base\View')->create($context->getConfig(), $templatePaths, $lang); |
|
| 182 | + $context->setView($view); |
|
| 183 | 183 | |
| 184 | - return \Aimeos\Controller\JsonAdm\Factory::createController( $context, $templatePaths, $resource ); |
|
| 184 | + return \Aimeos\Controller\JsonAdm\Factory::createController($context, $templatePaths, $resource); |
|
| 185 | 185 | } |
| 186 | 186 | |
| 187 | 187 | |
@@ -193,12 +193,12 @@ discard block |
||
| 193 | 193 | * @param array $header List of HTTP headers |
| 194 | 194 | * @return \Illuminate\Http\Response HTTP response object |
| 195 | 195 | */ |
| 196 | - protected function createResponse( $content, $status, array $header ) |
|
| 196 | + protected function createResponse($content, $status, array $header) |
|
| 197 | 197 | { |
| 198 | - $response = Response::make( $content, $status ); |
|
| 198 | + $response = Response::make($content, $status); |
|
| 199 | 199 | |
| 200 | - foreach( $header as $key => $value ) { |
|
| 201 | - $response->header( $key, $value ); |
|
| 200 | + foreach ($header as $key => $value) { |
|
| 201 | + $response->header($key, $value); |
|
| 202 | 202 | } |
| 203 | 203 | |
| 204 | 204 | return $response; |
@@ -213,23 +213,23 @@ discard block |
||
| 213 | 213 | * @param string $lang ISO language code, e.g. "en" or "en_GB" |
| 214 | 214 | * @return \Aimeos\MShop\Context\Item\Iface Modified context object |
| 215 | 215 | */ |
| 216 | - protected function setLocale( \Aimeos\MShop\Context\Item\Iface $context, $sitecode, $lang ) |
|
| 216 | + protected function setLocale(\Aimeos\MShop\Context\Item\Iface $context, $sitecode, $lang) |
|
| 217 | 217 | { |
| 218 | - $localeManager = \Aimeos\MShop\Factory::createManager( $context, 'locale' ); |
|
| 218 | + $localeManager = \Aimeos\MShop\Factory::createManager($context, 'locale'); |
|
| 219 | 219 | |
| 220 | 220 | try |
| 221 | 221 | { |
| 222 | - $localeItem = $localeManager->bootstrap( $sitecode, '', '', false ); |
|
| 223 | - $localeItem->setLanguageId( null ); |
|
| 224 | - $localeItem->setCurrencyId( null ); |
|
| 222 | + $localeItem = $localeManager->bootstrap($sitecode, '', '', false); |
|
| 223 | + $localeItem->setLanguageId(null); |
|
| 224 | + $localeItem->setCurrencyId(null); |
|
| 225 | 225 | } |
| 226 | - catch( \Aimeos\MShop\Locale\Exception $e ) |
|
| 226 | + catch (\Aimeos\MShop\Locale\Exception $e) |
|
| 227 | 227 | { |
| 228 | 228 | $localeItem = $localeManager->createItem(); |
| 229 | 229 | } |
| 230 | 230 | |
| 231 | - $context->setLocale( $localeItem ); |
|
| 232 | - $context->setI18n( app('\Aimeos\Shop\Base\I18n')->get( array( $lang ) ) ); |
|
| 231 | + $context->setLocale($localeItem); |
|
| 232 | + $context->setI18n(app('\Aimeos\Shop\Base\I18n')->get(array($lang))); |
|
| 233 | 233 | |
| 234 | 234 | return $context; |
| 235 | 235 | } |
@@ -28,31 +28,31 @@ |
||
| 28 | 28 | */ |
| 29 | 29 | public function boot() |
| 30 | 30 | { |
| 31 | - $basedir = dirname(dirname(__DIR__)).DIRECTORY_SEPARATOR; |
|
| 31 | + $basedir = dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR; |
|
| 32 | 32 | |
| 33 | - $this->mergeConfigFrom(dirname(dirname(__DIR__)).DIRECTORY_SEPARATOR.'config/shop.php', 'shop'); |
|
| 33 | + $this->mergeConfigFrom(dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR . 'config/shop.php', 'shop'); |
|
| 34 | 34 | |
| 35 | - $this->loadViewsFrom($basedir.'views', 'shop'); |
|
| 35 | + $this->loadViewsFrom($basedir . 'views', 'shop'); |
|
| 36 | 36 | |
| 37 | 37 | |
| 38 | 38 | $this->publishes(array( |
| 39 | - $basedir.'config/shop.php' => config_path('shop.php'), |
|
| 39 | + $basedir . 'config/shop.php' => config_path('shop.php'), |
|
| 40 | 40 | ), 'config'); |
| 41 | 41 | |
| 42 | 42 | $this->publishes(array( |
| 43 | - $basedir.'database/migrations' => base_path('database/migrations'), |
|
| 43 | + $basedir . 'database/migrations' => base_path('database/migrations'), |
|
| 44 | 44 | ), 'migrations'); |
| 45 | 45 | |
| 46 | 46 | $this->publishes(array( |
| 47 | - $basedir.'views' => base_path('resources/views/vendor/shop'), |
|
| 47 | + $basedir . 'views' => base_path('resources/views/vendor/shop'), |
|
| 48 | 48 | ), 'views'); |
| 49 | 49 | |
| 50 | 50 | $this->publishes(array( |
| 51 | - dirname($basedir).DIRECTORY_SEPARATOR.'public' => public_path('packages/aimeos/shop'), |
|
| 51 | + dirname($basedir) . DIRECTORY_SEPARATOR . 'public' => public_path('packages/aimeos/shop'), |
|
| 52 | 52 | ), 'public'); |
| 53 | 53 | |
| 54 | 54 | |
| 55 | - require $basedir.'routes.php'; |
|
| 55 | + require $basedir . 'routes.php'; |
|
| 56 | 56 | } |
| 57 | 57 | |
| 58 | 58 | |