@@ -28,9 +28,9 @@ discard block |
||
28 | 28 | */ |
29 | 29 | protected function configure() |
30 | 30 | { |
31 | - $this->setName( 'aimeos:cache' ); |
|
32 | - $this->setDescription( 'Clears the content cache' ); |
|
33 | - $this->addArgument( 'site', InputArgument::OPTIONAL, 'Site codes to clear the cache like "default unittest" (none for all)' ); |
|
31 | + $this->setName('aimeos:cache'); |
|
32 | + $this->setDescription('Clears the content cache'); |
|
33 | + $this->addArgument('site', InputArgument::OPTIONAL, 'Site codes to clear the cache like "default unittest" (none for all)'); |
|
34 | 34 | } |
35 | 35 | |
36 | 36 | |
@@ -40,26 +40,26 @@ discard block |
||
40 | 40 | * @param InputInterface $input Input object |
41 | 41 | * @param OutputInterface $output Output object |
42 | 42 | */ |
43 | - protected function execute( InputInterface $input, OutputInterface $output ) |
|
43 | + protected function execute(InputInterface $input, OutputInterface $output) |
|
44 | 44 | { |
45 | - $context = $this->getContainer()->get( 'aimeos_context' )->get( false, 'command' ); |
|
46 | - $context->setEditor( 'aimeos:cache' ); |
|
45 | + $context = $this->getContainer()->get('aimeos_context')->get(false, 'command'); |
|
46 | + $context->setEditor('aimeos:cache'); |
|
47 | 47 | |
48 | - $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context ); |
|
48 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context); |
|
49 | 49 | |
50 | - foreach( $this->getSiteItems( $context, $input ) as $siteItem ) |
|
50 | + foreach ($this->getSiteItems($context, $input) as $siteItem) |
|
51 | 51 | { |
52 | - $localeItem = $localeManager->bootstrap( $siteItem->getCode(), '', '', false ); |
|
52 | + $localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false); |
|
53 | 53 | |
54 | 54 | $lcontext = clone $context; |
55 | - $lcontext->setLocale( $localeItem ); |
|
55 | + $lcontext->setLocale($localeItem); |
|
56 | 56 | |
57 | - $cache = new \Aimeos\MAdmin\Cache\Proxy\Standard( $lcontext ); |
|
58 | - $lcontext->setCache( $cache ); |
|
57 | + $cache = new \Aimeos\MAdmin\Cache\Proxy\Standard($lcontext); |
|
58 | + $lcontext->setCache($cache); |
|
59 | 59 | |
60 | - $output->writeln( sprintf( 'Clearing the Aimeos cache for site <info>%1$s</info>', $siteItem->getCode() ) ); |
|
60 | + $output->writeln(sprintf('Clearing the Aimeos cache for site <info>%1$s</info>', $siteItem->getCode())); |
|
61 | 61 | |
62 | - \Aimeos\MAdmin\Cache\Manager\Factory::createManager( $lcontext )->getCache()->clear(); |
|
62 | + \Aimeos\MAdmin\Cache\Manager\Factory::createManager($lcontext)->getCache()->clear(); |
|
63 | 63 | } |
64 | 64 | } |
65 | 65 | } |
@@ -31,21 +31,21 @@ discard block |
||
31 | 31 | /** |
32 | 32 | * {@inheritDoc} |
33 | 33 | */ |
34 | - public function load( array $configs, ContainerBuilder $container ) |
|
34 | + public function load(array $configs, ContainerBuilder $container) |
|
35 | 35 | { |
36 | 36 | $configuration = new Configuration(); |
37 | - $config = $this->processConfiguration( $configuration, $configs ); |
|
37 | + $config = $this->processConfiguration($configuration, $configs); |
|
38 | 38 | |
39 | - foreach( $configs as $list ) { |
|
40 | - $config = array_replace_recursive( $config, $list ); |
|
39 | + foreach ($configs as $list) { |
|
40 | + $config = array_replace_recursive($config, $list); |
|
41 | 41 | } |
42 | 42 | |
43 | - foreach( $config as $key => $value ) { |
|
44 | - $container->setParameter( 'aimeos_shop.' . $key, $value ); |
|
43 | + foreach ($config as $key => $value) { |
|
44 | + $container->setParameter('aimeos_shop.'.$key, $value); |
|
45 | 45 | } |
46 | 46 | |
47 | - $loader = new Loader\YamlFileLoader( $container, new FileLocator( dirname( __DIR__ ) . '/Resources/config' ) ); |
|
48 | - $loader->load( 'services.yml' ); |
|
47 | + $loader = new Loader\YamlFileLoader($container, new FileLocator(dirname(__DIR__).'/Resources/config')); |
|
48 | + $loader->load('services.yml'); |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | |
@@ -54,12 +54,12 @@ discard block |
||
54 | 54 | * |
55 | 55 | * @param ContainerBuilder $container ContainerBuilder object |
56 | 56 | */ |
57 | - public function prepend( ContainerBuilder $container ) |
|
57 | + public function prepend(ContainerBuilder $container) |
|
58 | 58 | { |
59 | - $configFile = dirname( __DIR__ ) . '/Resources/config/aimeos_shop.yml'; |
|
60 | - $config = Yaml::parse( file_get_contents( $configFile ) ); |
|
59 | + $configFile = dirname(__DIR__).'/Resources/config/aimeos_shop.yml'; |
|
60 | + $config = Yaml::parse(file_get_contents($configFile)); |
|
61 | 61 | |
62 | - $container->prependExtensionConfig( 'aimeos_shop', $config ); |
|
63 | - $container->addResource( new FileResource( $configFile ) ); |
|
62 | + $container->prependExtensionConfig('aimeos_shop', $config); |
|
63 | + $container->addResource(new FileResource($configFile)); |
|
64 | 64 | } |
65 | 65 | } |
@@ -3,24 +3,24 @@ discard block |
||
3 | 3 | use Doctrine\Common\Annotations\AnnotationRegistry; |
4 | 4 | |
5 | 5 | |
6 | -setlocale( LC_ALL, 'en_US.UTF-8' ); |
|
6 | +setlocale(LC_ALL, 'en_US.UTF-8'); |
|
7 | 7 | |
8 | 8 | // if the bundle is within a symfony project, try to reuse the project's autoload |
9 | 9 | $files = array( |
10 | - __DIR__ . '/../vendor/autoload.php', |
|
11 | - __DIR__ . '/../../vendor/autoload.php', |
|
10 | + __DIR__.'/../vendor/autoload.php', |
|
11 | + __DIR__.'/../../vendor/autoload.php', |
|
12 | 12 | ); |
13 | 13 | |
14 | 14 | $autoload = false; |
15 | -foreach( $files as $file ) |
|
15 | +foreach ($files as $file) |
|
16 | 16 | { |
17 | - if( is_file( $file ) ) { |
|
17 | + if (is_file($file)) { |
|
18 | 18 | $autoload = require $file; |
19 | 19 | break; |
20 | 20 | } |
21 | 21 | } |
22 | 22 | |
23 | -if( !$autoload ) |
|
23 | +if (!$autoload) |
|
24 | 24 | { |
25 | 25 | exit( |
26 | 26 | "Unable to find autoload.php file, please use composer to load dependencies: |
@@ -30,4 +30,4 @@ discard block |
||
30 | 30 | ); |
31 | 31 | } |
32 | 32 | |
33 | -AnnotationRegistry::registerLoader( array( $autoload, 'loadClass' ) ); |
|
33 | +AnnotationRegistry::registerLoader(array($autoload, 'loadClass')); |
@@ -28,9 +28,9 @@ discard block |
||
28 | 28 | /** |
29 | 29 | * {@inheritdoc} |
30 | 30 | */ |
31 | - public function registerContainerConfiguration( LoaderInterface $loader ) |
|
31 | + public function registerContainerConfiguration(LoaderInterface $loader) |
|
32 | 32 | { |
33 | - $loader->load( __DIR__ . '/config/config.yml' ); |
|
33 | + $loader->load(__DIR__.'/config/config.yml'); |
|
34 | 34 | } |
35 | 35 | |
36 | 36 | |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | */ |
40 | 40 | public function getCacheDir() |
41 | 41 | { |
42 | - return sys_get_temp_dir() . '/aimeos-symfony/cache'; |
|
42 | + return sys_get_temp_dir().'/aimeos-symfony/cache'; |
|
43 | 43 | } |
44 | 44 | |
45 | 45 | |
@@ -48,6 +48,6 @@ discard block |
||
48 | 48 | */ |
49 | 49 | public function getLogDir() |
50 | 50 | { |
51 | - return sys_get_temp_dir() . '/aimeos-symfony/logs'; |
|
51 | + return sys_get_temp_dir().'/aimeos-symfony/logs'; |
|
52 | 52 | } |
53 | 53 | } |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | * |
30 | 30 | * @param Container $container Container object to access parameters |
31 | 31 | */ |
32 | - public function __construct( Container $container ) |
|
32 | + public function __construct(Container $container) |
|
33 | 33 | { |
34 | 34 | $this->container = $container; |
35 | 35 | } |
@@ -41,27 +41,27 @@ discard block |
||
41 | 41 | * @param array $languageIds List of two letter ISO language IDs |
42 | 42 | * @return \Aimeos\MW\Translation\Interface[] List of translation objects |
43 | 43 | */ |
44 | - public function get( array $languageIds ) |
|
44 | + public function get(array $languageIds) |
|
45 | 45 | { |
46 | - $i18nPaths = $this->container->get( 'aimeos' )->get()->getI18nPaths(); |
|
46 | + $i18nPaths = $this->container->get('aimeos')->get()->getI18nPaths(); |
|
47 | 47 | |
48 | - foreach( $languageIds as $langid ) |
|
48 | + foreach ($languageIds as $langid) |
|
49 | 49 | { |
50 | - if( !isset( $this->i18n[$langid] ) ) |
|
50 | + if (!isset($this->i18n[$langid])) |
|
51 | 51 | { |
52 | - $i18n = new \Aimeos\MW\Translation\Gettext( $i18nPaths, $langid ); |
|
52 | + $i18n = new \Aimeos\MW\Translation\Gettext($i18nPaths, $langid); |
|
53 | 53 | |
54 | - $apc = (bool) $this->container->getParameter( 'aimeos_shop.apc_enable' ); |
|
55 | - $prefix = $this->container->getParameter( 'aimeos_shop.apc_prefix' ); |
|
54 | + $apc = (bool) $this->container->getParameter('aimeos_shop.apc_enable'); |
|
55 | + $prefix = $this->container->getParameter('aimeos_shop.apc_prefix'); |
|
56 | 56 | |
57 | - if( function_exists( 'apcu_store' ) === true && $apc === true ) { |
|
58 | - $i18n = new \Aimeos\MW\Translation\Decorator\APC( $i18n, $prefix ); |
|
57 | + if (function_exists('apcu_store') === true && $apc === true) { |
|
58 | + $i18n = new \Aimeos\MW\Translation\Decorator\APC($i18n, $prefix); |
|
59 | 59 | } |
60 | 60 | |
61 | - $translations = $this->container->getParameter( 'aimeos_shop.i18n' ); |
|
61 | + $translations = $this->container->getParameter('aimeos_shop.i18n'); |
|
62 | 62 | |
63 | - if( isset( $translations[$langid] ) ) { |
|
64 | - $i18n = new \Aimeos\MW\Translation\Decorator\Memory( $i18n, $translations[$langid] ); |
|
63 | + if (isset($translations[$langid])) { |
|
64 | + $i18n = new \Aimeos\MW\Translation\Decorator\Memory($i18n, $translations[$langid]); |
|
65 | 65 | } |
66 | 66 | |
67 | 67 | $this->i18n[$langid] = $i18n; |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | * |
29 | 29 | * @param Container $container Container object to access parameters |
30 | 30 | */ |
31 | - public function __construct( Container $container ) |
|
31 | + public function __construct(Container $container) |
|
32 | 32 | { |
33 | 33 | $this->container = $container; |
34 | 34 | } |
@@ -40,33 +40,33 @@ discard block |
||
40 | 40 | * @param string $type Configuration type ("frontend" or "backend") |
41 | 41 | * @return \Aimeos\MW\Config\Iface Config object |
42 | 42 | */ |
43 | - public function get( $type = 'frontend' ) |
|
43 | + public function get($type = 'frontend') |
|
44 | 44 | { |
45 | 45 | $configPaths = $this->container->get('aimeos')->get()->getConfigPaths(); |
46 | 46 | |
47 | - $conf = new \Aimeos\MW\Config\PHPArray( array(), $configPaths ); |
|
47 | + $conf = new \Aimeos\MW\Config\PHPArray(array(), $configPaths); |
|
48 | 48 | |
49 | - $apc = (bool) $this->container->getParameter( 'aimeos_shop.apc_enable' ); |
|
50 | - $prefix = $this->container->getParameter( 'aimeos_shop.apc_prefix' ); |
|
49 | + $apc = (bool) $this->container->getParameter('aimeos_shop.apc_enable'); |
|
50 | + $prefix = $this->container->getParameter('aimeos_shop.apc_prefix'); |
|
51 | 51 | |
52 | - if( function_exists( 'apcu_store' ) === true && $apc === true ) { |
|
53 | - $conf = new \Aimeos\MW\Config\Decorator\APC( $conf, $prefix ); |
|
52 | + if (function_exists('apcu_store') === true && $apc === true) { |
|
53 | + $conf = new \Aimeos\MW\Config\Decorator\APC($conf, $prefix); |
|
54 | 54 | } |
55 | 55 | |
56 | 56 | $local = array( |
57 | - 'admin' => $this->container->getParameter( 'aimeos_shop.admin' ), |
|
58 | - 'client' => $this->container->getParameter( 'aimeos_shop.client' ), |
|
59 | - 'controller' => $this->container->getParameter( 'aimeos_shop.controller' ), |
|
60 | - 'madmin' => $this->container->getParameter( 'aimeos_shop.madmin' ), |
|
61 | - 'mshop' => $this->container->getParameter( 'aimeos_shop.mshop' ), |
|
62 | - 'resource' => $this->container->getParameter( 'aimeos_shop.resource' ), |
|
57 | + 'admin' => $this->container->getParameter('aimeos_shop.admin'), |
|
58 | + 'client' => $this->container->getParameter('aimeos_shop.client'), |
|
59 | + 'controller' => $this->container->getParameter('aimeos_shop.controller'), |
|
60 | + 'madmin' => $this->container->getParameter('aimeos_shop.madmin'), |
|
61 | + 'mshop' => $this->container->getParameter('aimeos_shop.mshop'), |
|
62 | + 'resource' => $this->container->getParameter('aimeos_shop.resource'), |
|
63 | 63 | ); |
64 | 64 | |
65 | - $config = new \Aimeos\MW\Config\Decorator\Memory( $conf, $local ); |
|
66 | - $settings = $this->container->getParameter( 'aimeos_shop.' . $type ); |
|
65 | + $config = new \Aimeos\MW\Config\Decorator\Memory($conf, $local); |
|
66 | + $settings = $this->container->getParameter('aimeos_shop.'.$type); |
|
67 | 67 | |
68 | - if( $settings !== array() ) { |
|
69 | - $config = new \Aimeos\MW\Config\Decorator\Memory( $config, $settings ); |
|
68 | + if ($settings !== array()) { |
|
69 | + $config = new \Aimeos\MW\Config\Decorator\Memory($config, $settings); |
|
70 | 70 | } |
71 | 71 | |
72 | 72 | return $config; |
@@ -30,64 +30,64 @@ discard block |
||
30 | 30 | * @param Request $request Symfony request object |
31 | 31 | * @return Response Generated output for the admin interface |
32 | 32 | */ |
33 | - public function indexAction( Request $request ) |
|
33 | + public function indexAction(Request $request) |
|
34 | 34 | { |
35 | - $site = $request->attributes->get( 'site', $request->query->get( 'site', 'default' ) ); |
|
36 | - $lang = $request->attributes->get( 'lang', $request->query->get( 'lang', 'en' ) ); |
|
37 | - $tab = $request->attributes->get( 'tab', $request->query->get( 'tab', 0 ) ); |
|
35 | + $site = $request->attributes->get('site', $request->query->get('site', 'default')); |
|
36 | + $lang = $request->attributes->get('lang', $request->query->get('lang', 'en')); |
|
37 | + $tab = $request->attributes->get('tab', $request->query->get('tab', 0)); |
|
38 | 38 | |
39 | - $context = $this->get( 'aimeos_context' )->get( false, 'backend' ); |
|
40 | - $context->setLocale( $this->get( 'aimeos_locale' )->getBackend( $context, $site ) ); |
|
39 | + $context = $this->get('aimeos_context')->get(false, 'backend'); |
|
40 | + $context->setLocale($this->get('aimeos_locale')->getBackend($context, $site)); |
|
41 | 41 | |
42 | - $aimeos = $this->get( 'aimeos' ); |
|
42 | + $aimeos = $this->get('aimeos'); |
|
43 | 43 | $bootstrap = $aimeos->get(); |
44 | 44 | |
45 | - $cntlPaths = $bootstrap->getCustomPaths( 'controller/extjs' ); |
|
46 | - $controller = new \Aimeos\Controller\ExtJS\JsonRpc( $context, $cntlPaths ); |
|
45 | + $cntlPaths = $bootstrap->getCustomPaths('controller/extjs'); |
|
46 | + $controller = new \Aimeos\Controller\ExtJS\JsonRpc($context, $cntlPaths); |
|
47 | 47 | $cssFiles = array(); |
48 | 48 | |
49 | - foreach( $bootstrap->getCustomPaths( 'admin/extjs' ) as $base => $paths ) |
|
49 | + foreach ($bootstrap->getCustomPaths('admin/extjs') as $base => $paths) |
|
50 | 50 | { |
51 | - foreach( $paths as $path ) |
|
51 | + foreach ($paths as $path) |
|
52 | 52 | { |
53 | - $jsbAbsPath = $base . '/' . $path; |
|
53 | + $jsbAbsPath = $base.'/'.$path; |
|
54 | 54 | |
55 | - if( !is_file( $jsbAbsPath ) ) { |
|
56 | - throw new \Exception( sprintf( 'JSB2 file "%1$s" not found', $jsbAbsPath ) ); |
|
55 | + if (!is_file($jsbAbsPath)) { |
|
56 | + throw new \Exception(sprintf('JSB2 file "%1$s" not found', $jsbAbsPath)); |
|
57 | 57 | } |
58 | 58 | |
59 | - $jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $path ) ); |
|
60 | - $cssFiles = array_merge( $cssFiles, $jsb2->getUrls( 'css' ) ); |
|
59 | + $jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($path)); |
|
60 | + $cssFiles = array_merge($cssFiles, $jsb2->getUrls('css')); |
|
61 | 61 | } |
62 | 62 | } |
63 | 63 | |
64 | - $params = array( 'site' => '{site}', 'lang' => '{lang}', 'tab' => '{tab}' ); |
|
65 | - $adminUrl = $this->generateUrl( 'aimeos_shop_extadm', $params ); |
|
64 | + $params = array('site' => '{site}', 'lang' => '{lang}', 'tab' => '{tab}'); |
|
65 | + $adminUrl = $this->generateUrl('aimeos_shop_extadm', $params); |
|
66 | 66 | |
67 | - $token = $this->get( 'security.csrf.token_manager' )->getToken( 'aimeos_admin_token' )->getValue(); |
|
68 | - $jsonUrl = $this->generateUrl( 'aimeos_shop_extadm_json', array( '_token' => $token, 'site' => $site ) ); |
|
67 | + $token = $this->get('security.csrf.token_manager')->getToken('aimeos_admin_token')->getValue(); |
|
68 | + $jsonUrl = $this->generateUrl('aimeos_shop_extadm_json', array('_token' => $token, 'site' => $site)); |
|
69 | 69 | |
70 | - $jqadmUrl = $this->generateUrl( 'aimeos_shop_jqadm_search', array( 'site' => $site, 'lang' => $lang, 'resource' => 'dashboard' ) ); |
|
70 | + $jqadmUrl = $this->generateUrl('aimeos_shop_jqadm_search', array('site' => $site, 'lang' => $lang, 'resource' => 'dashboard')); |
|
71 | 71 | |
72 | 72 | $vars = array( |
73 | 73 | 'lang' => $lang, |
74 | 74 | 'cssFiles' => $cssFiles, |
75 | 75 | 'languages' => $this->getJsonLanguages(), |
76 | - 'config' => $this->getJsonClientConfig( $context ), |
|
77 | - 'site' => $this->getJsonSiteItem( $context, $site ), |
|
78 | - 'i18nContent' => $this->getJsonClientI18n( $bootstrap->getI18nPaths(), $lang ), |
|
76 | + 'config' => $this->getJsonClientConfig($context), |
|
77 | + 'site' => $this->getJsonSiteItem($context, $site), |
|
78 | + 'i18nContent' => $this->getJsonClientI18n($bootstrap->getI18nPaths(), $lang), |
|
79 | 79 | 'searchSchemas' => $controller->getJsonSearchSchemas(), |
80 | 80 | 'itemSchemas' => $controller->getJsonItemSchemas(), |
81 | - 'smd' => $controller->getJsonSmd( $jsonUrl ), |
|
82 | - 'urlTemplate' => urldecode( $adminUrl ), |
|
83 | - 'uploaddir' => $this->container->getParameter( 'aimeos_shop.uploaddir' ), |
|
84 | - 'extensions' => implode( ',', $bootstrap->getExtensions() ), |
|
81 | + 'smd' => $controller->getJsonSmd($jsonUrl), |
|
82 | + 'urlTemplate' => urldecode($adminUrl), |
|
83 | + 'uploaddir' => $this->container->getParameter('aimeos_shop.uploaddir'), |
|
84 | + 'extensions' => implode(',', $bootstrap->getExtensions()), |
|
85 | 85 | 'version' => $aimeos->getVersion(), |
86 | 86 | 'jqadmurl' => $jqadmUrl, |
87 | 87 | 'activeTab' => $tab, |
88 | 88 | ); |
89 | 89 | |
90 | - return $this->render( 'AimeosShopBundle:Extadm:index.html.twig', $vars ); |
|
90 | + return $this->render('AimeosShopBundle:Extadm:index.html.twig', $vars); |
|
91 | 91 | } |
92 | 92 | |
93 | 93 | |
@@ -97,23 +97,23 @@ discard block |
||
97 | 97 | * @param Request $request Symfony request object |
98 | 98 | * @return Response JSON RPC message response |
99 | 99 | */ |
100 | - public function doAction( Request $request ) |
|
100 | + public function doAction(Request $request) |
|
101 | 101 | { |
102 | 102 | $csrfProvider = $this->get('security.csrf.token_manager'); |
103 | 103 | |
104 | - if( $csrfProvider->isTokenValid( new CsrfToken( 'aimeos_admin_token', $request->query->get( '_token' ) ) ) !== true ) { |
|
105 | - throw new \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException( 'CSRF token is invalid' ); |
|
104 | + if ($csrfProvider->isTokenValid(new CsrfToken('aimeos_admin_token', $request->query->get('_token'))) !== true) { |
|
105 | + throw new \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException('CSRF token is invalid'); |
|
106 | 106 | } |
107 | 107 | |
108 | - $cntlPaths = $this->get( 'aimeos' )->get()->getCustomPaths( 'controller/extjs' ); |
|
109 | - $context = $this->get( 'aimeos_context' )->get( false, 'backend' ); |
|
110 | - $context->setView( $this->get( 'aimeos_view' )->create( $context, array() ) ); |
|
111 | - $context->setLocale( $this->get( 'aimeos_locale' )->getBackend( $context, 'default' ) ); |
|
108 | + $cntlPaths = $this->get('aimeos')->get()->getCustomPaths('controller/extjs'); |
|
109 | + $context = $this->get('aimeos_context')->get(false, 'backend'); |
|
110 | + $context->setView($this->get('aimeos_view')->create($context, array())); |
|
111 | + $context->setLocale($this->get('aimeos_locale')->getBackend($context, 'default')); |
|
112 | 112 | |
113 | - $controller = new \Aimeos\Controller\ExtJS\JsonRpc( $context, $cntlPaths ); |
|
113 | + $controller = new \Aimeos\Controller\ExtJS\JsonRpc($context, $cntlPaths); |
|
114 | 114 | |
115 | - $response = $controller->process( $request->request->all(), $request->getContent() ); |
|
116 | - return $this->render( 'AimeosShopBundle:Extadm:do.html.twig', array( 'output' => $response ) ); |
|
115 | + $response = $controller->process($request->request->all(), $request->getContent()); |
|
116 | + return $this->render('AimeosShopBundle:Extadm:do.html.twig', array('output' => $response)); |
|
117 | 117 | } |
118 | 118 | |
119 | 119 | |
@@ -126,27 +126,27 @@ discard block |
||
126 | 126 | { |
127 | 127 | $contents = ''; |
128 | 128 | $jsFiles = array(); |
129 | - $aimeos = $this->get( 'aimeos' )->get(); |
|
129 | + $aimeos = $this->get('aimeos')->get(); |
|
130 | 130 | |
131 | - foreach( $aimeos->getCustomPaths( 'admin/extjs' ) as $base => $paths ) |
|
131 | + foreach ($aimeos->getCustomPaths('admin/extjs') as $base => $paths) |
|
132 | 132 | { |
133 | - foreach( $paths as $path ) |
|
133 | + foreach ($paths as $path) |
|
134 | 134 | { |
135 | - $jsbAbsPath = $base . '/' . $path; |
|
136 | - $jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $jsbAbsPath ) ); |
|
137 | - $jsFiles = array_merge( $jsFiles, $jsb2->getFiles( 'js' ) ); |
|
135 | + $jsbAbsPath = $base.'/'.$path; |
|
136 | + $jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($jsbAbsPath)); |
|
137 | + $jsFiles = array_merge($jsFiles, $jsb2->getFiles('js')); |
|
138 | 138 | } |
139 | 139 | } |
140 | 140 | |
141 | - foreach( $jsFiles as $file ) |
|
141 | + foreach ($jsFiles as $file) |
|
142 | 142 | { |
143 | - if( ( $content = file_get_contents( $file ) ) !== false ) { |
|
143 | + if (($content = file_get_contents($file)) !== false) { |
|
144 | 144 | $contents .= $content; |
145 | 145 | } |
146 | 146 | } |
147 | 147 | |
148 | - $response = new Response( $contents ); |
|
149 | - $response->headers->set( 'Content-Type', 'application/javascript' ); |
|
148 | + $response = new Response($contents); |
|
149 | + $response->headers->set('Content-Type', 'application/javascript'); |
|
150 | 150 | |
151 | 151 | return $response; |
152 | 152 | } |
@@ -161,11 +161,11 @@ discard block |
||
161 | 161 | { |
162 | 162 | $result = array(); |
163 | 163 | |
164 | - foreach( $this->get( 'aimeos' )->get()->getI18nList( 'admin' ) as $id ) { |
|
165 | - $result[] = array( 'id' => $id, 'label' => $id ); |
|
164 | + foreach ($this->get('aimeos')->get()->getI18nList('admin') as $id) { |
|
165 | + $result[] = array('id' => $id, 'label' => $id); |
|
166 | 166 | } |
167 | 167 | |
168 | - return json_encode( $result ); |
|
168 | + return json_encode($result); |
|
169 | 169 | } |
170 | 170 | |
171 | 171 | |
@@ -175,10 +175,10 @@ discard block |
||
175 | 175 | * @param \Aimeos\MShop\Context\Item\Iface $context Context item object |
176 | 176 | * @return string JSON encoded configuration object |
177 | 177 | */ |
178 | - protected function getJsonClientConfig( \Aimeos\MShop\Context\Item\Iface $context ) |
|
178 | + protected function getJsonClientConfig(\Aimeos\MShop\Context\Item\Iface $context) |
|
179 | 179 | { |
180 | - $config = $context->getConfig()->get( 'admin/extjs', array() ); |
|
181 | - return json_encode( array( 'admin' => array( 'extjs' => $config ) ), JSON_FORCE_OBJECT ); |
|
180 | + $config = $context->getConfig()->get('admin/extjs', array()); |
|
181 | + return json_encode(array('admin' => array('extjs' => $config)), JSON_FORCE_OBJECT); |
|
182 | 182 | } |
183 | 183 | |
184 | 184 | |
@@ -189,16 +189,16 @@ discard block |
||
189 | 189 | * @param string $lang ISO language code like "en" or "en_GB" |
190 | 190 | * @return string JSON encoded translation object |
191 | 191 | */ |
192 | - protected function getJsonClientI18n( array $i18nPaths, $lang ) |
|
192 | + protected function getJsonClientI18n(array $i18nPaths, $lang) |
|
193 | 193 | { |
194 | - $i18n = new \Aimeos\MW\Translation\Gettext( $i18nPaths, $lang ); |
|
194 | + $i18n = new \Aimeos\MW\Translation\Gettext($i18nPaths, $lang); |
|
195 | 195 | |
196 | 196 | $content = array( |
197 | - 'admin' => $i18n->getAll( 'admin' ), |
|
198 | - 'admin/ext' => $i18n->getAll( 'admin/ext' ), |
|
197 | + 'admin' => $i18n->getAll('admin'), |
|
198 | + 'admin/ext' => $i18n->getAll('admin/ext'), |
|
199 | 199 | ); |
200 | 200 | |
201 | - return json_encode( $content, JSON_FORCE_OBJECT ); |
|
201 | + return json_encode($content, JSON_FORCE_OBJECT); |
|
202 | 202 | } |
203 | 203 | |
204 | 204 | |
@@ -210,18 +210,18 @@ discard block |
||
210 | 210 | * @return string JSON encoded site item object |
211 | 211 | * @throws Exception If no site item was found for the code |
212 | 212 | */ |
213 | - protected function getJsonSiteItem( \Aimeos\MShop\Context\Item\Iface $context, $site ) |
|
213 | + protected function getJsonSiteItem(\Aimeos\MShop\Context\Item\Iface $context, $site) |
|
214 | 214 | { |
215 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'locale/site' ); |
|
215 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'locale/site'); |
|
216 | 216 | |
217 | 217 | $criteria = $manager->createSearch(); |
218 | - $criteria->setConditions( $criteria->compare( '==', 'locale.site.code', $site ) ); |
|
219 | - $items = $manager->searchItems( $criteria ); |
|
218 | + $criteria->setConditions($criteria->compare('==', 'locale.site.code', $site)); |
|
219 | + $items = $manager->searchItems($criteria); |
|
220 | 220 | |
221 | - if( ( $item = reset( $items ) ) === false ) { |
|
222 | - throw new \Exception( sprintf( 'No site found for code "%1$s"', $site ) ); |
|
221 | + if (($item = reset($items)) === false) { |
|
222 | + throw new \Exception(sprintf('No site found for code "%1$s"', $site)); |
|
223 | 223 | } |
224 | 224 | |
225 | - return json_encode( $item->toArray() ); |
|
225 | + return json_encode($item->toArray()); |
|
226 | 226 | } |
227 | 227 | } |
@@ -19,138 +19,138 @@ discard block |
||
19 | 19 | |
20 | 20 | public function testGetId() |
21 | 21 | { |
22 | - $this->assertEquals( null, $this->object->getId() ); |
|
22 | + $this->assertEquals(null, $this->object->getId()); |
|
23 | 23 | } |
24 | 24 | |
25 | 25 | |
26 | 26 | public function testGetSetCompany() |
27 | 27 | { |
28 | - $this->object->setCompany( 'ABC' ); |
|
29 | - $this->assertEquals( 'ABC', $this->object->getCompany() ); |
|
28 | + $this->object->setCompany('ABC'); |
|
29 | + $this->assertEquals('ABC', $this->object->getCompany()); |
|
30 | 30 | } |
31 | 31 | |
32 | 32 | |
33 | 33 | public function testGetSetVatID() |
34 | 34 | { |
35 | - $this->object->setVatID( 'AT0000' ); |
|
36 | - $this->assertEquals( 'AT0000', $this->object->getVatID() ); |
|
35 | + $this->object->setVatID('AT0000'); |
|
36 | + $this->assertEquals('AT0000', $this->object->getVatID()); |
|
37 | 37 | } |
38 | 38 | |
39 | 39 | |
40 | 40 | public function testGetSetSalutation() |
41 | 41 | { |
42 | - $this->object->setSalutation( \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_UNKNOWN ); |
|
43 | - $this->assertEquals( \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_UNKNOWN, $this->object->getSalutation() ); |
|
42 | + $this->object->setSalutation(\Aimeos\MShop\Common\Item\Address\Base::SALUTATION_UNKNOWN); |
|
43 | + $this->assertEquals(\Aimeos\MShop\Common\Item\Address\Base::SALUTATION_UNKNOWN, $this->object->getSalutation()); |
|
44 | 44 | |
45 | - $this->object->setSalutation( \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_COMPANY ); |
|
46 | - $this->assertEquals( \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_COMPANY, $this->object->getSalutation() ); |
|
45 | + $this->object->setSalutation(\Aimeos\MShop\Common\Item\Address\Base::SALUTATION_COMPANY); |
|
46 | + $this->assertEquals(\Aimeos\MShop\Common\Item\Address\Base::SALUTATION_COMPANY, $this->object->getSalutation()); |
|
47 | 47 | |
48 | - $this->object->setSalutation( \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MRS ); |
|
49 | - $this->assertEquals( \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MRS, $this->object->getSalutation() ); |
|
48 | + $this->object->setSalutation(\Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MRS); |
|
49 | + $this->assertEquals(\Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MRS, $this->object->getSalutation()); |
|
50 | 50 | |
51 | - $this->object->setSalutation( \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MISS ); |
|
52 | - $this->assertEquals( \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MISS, $this->object->getSalutation() ); |
|
51 | + $this->object->setSalutation(\Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MISS); |
|
52 | + $this->assertEquals(\Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MISS, $this->object->getSalutation()); |
|
53 | 53 | |
54 | - $this->object->setSalutation( \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MR ); |
|
55 | - $this->assertEquals( \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MR, $this->object->getSalutation() ); |
|
54 | + $this->object->setSalutation(\Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MR); |
|
55 | + $this->assertEquals(\Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MR, $this->object->getSalutation()); |
|
56 | 56 | } |
57 | 57 | |
58 | 58 | |
59 | 59 | public function testGetSetTitle() |
60 | 60 | { |
61 | - $this->object->setTitle( 'Prof. Dr.' ); |
|
62 | - $this->assertEquals( 'Prof. Dr.', $this->object->getTitle() ); |
|
61 | + $this->object->setTitle('Prof. Dr.'); |
|
62 | + $this->assertEquals('Prof. Dr.', $this->object->getTitle()); |
|
63 | 63 | } |
64 | 64 | |
65 | 65 | |
66 | 66 | public function testGetSetFirstname() |
67 | 67 | { |
68 | - $this->object->setFirstname( 'first' ); |
|
69 | - $this->assertEquals( 'first', $this->object->getFirstname() ); |
|
68 | + $this->object->setFirstname('first'); |
|
69 | + $this->assertEquals('first', $this->object->getFirstname()); |
|
70 | 70 | } |
71 | 71 | |
72 | 72 | |
73 | 73 | public function testGetSetLastname() |
74 | 74 | { |
75 | - $this->object->setLastname( 'last' ); |
|
76 | - $this->assertEquals( 'last', $this->object->getLastname() ); |
|
75 | + $this->object->setLastname('last'); |
|
76 | + $this->assertEquals('last', $this->object->getLastname()); |
|
77 | 77 | } |
78 | 78 | |
79 | 79 | |
80 | 80 | public function testGetSetAddress1() |
81 | 81 | { |
82 | - $this->object->setAddress1( 'test street' ); |
|
83 | - $this->assertEquals( 'test street', $this->object->getAddress1() ); |
|
82 | + $this->object->setAddress1('test street'); |
|
83 | + $this->assertEquals('test street', $this->object->getAddress1()); |
|
84 | 84 | } |
85 | 85 | |
86 | 86 | |
87 | 87 | public function testGetSetAddress2() |
88 | 88 | { |
89 | - $this->object->setAddress2( '1' ); |
|
90 | - $this->assertEquals( '1', $this->object->getAddress2() ); |
|
89 | + $this->object->setAddress2('1'); |
|
90 | + $this->assertEquals('1', $this->object->getAddress2()); |
|
91 | 91 | } |
92 | 92 | |
93 | 93 | |
94 | 94 | public function testGetSetAddress3() |
95 | 95 | { |
96 | - $this->object->setAddress3( 'EG' ); |
|
97 | - $this->assertEquals( 'EG', $this->object->getAddress3() ); |
|
96 | + $this->object->setAddress3('EG'); |
|
97 | + $this->assertEquals('EG', $this->object->getAddress3()); |
|
98 | 98 | } |
99 | 99 | |
100 | 100 | |
101 | 101 | public function testGetSetPostal() |
102 | 102 | { |
103 | - $this->object->setPostal( '12345' ); |
|
104 | - $this->assertEquals( '12345', $this->object->getPostal() ); |
|
103 | + $this->object->setPostal('12345'); |
|
104 | + $this->assertEquals('12345', $this->object->getPostal()); |
|
105 | 105 | } |
106 | 106 | |
107 | 107 | |
108 | 108 | public function testGetSetCity() |
109 | 109 | { |
110 | - $this->object->setCity( 'Munich' ); |
|
111 | - $this->assertEquals( 'Munich', $this->object->getCity() ); |
|
110 | + $this->object->setCity('Munich'); |
|
111 | + $this->assertEquals('Munich', $this->object->getCity()); |
|
112 | 112 | } |
113 | 113 | |
114 | 114 | |
115 | 115 | public function testGetSetState() |
116 | 116 | { |
117 | - $this->object->setState( 'Bayern' ); |
|
118 | - $this->assertEquals( 'Bayern', $this->object->getState() ); |
|
117 | + $this->object->setState('Bayern'); |
|
118 | + $this->assertEquals('Bayern', $this->object->getState()); |
|
119 | 119 | } |
120 | 120 | |
121 | 121 | |
122 | 122 | public function testGetSetCountryId() |
123 | 123 | { |
124 | - $this->object->setCountryId( 'DE' ); |
|
125 | - $this->assertEquals( 'DE', $this->object->getCountryId() ); |
|
124 | + $this->object->setCountryId('DE'); |
|
125 | + $this->assertEquals('DE', $this->object->getCountryId()); |
|
126 | 126 | } |
127 | 127 | |
128 | 128 | |
129 | 129 | public function testGetSetLanguageId() |
130 | 130 | { |
131 | - $this->object->setLanguageId( 'de' ); |
|
132 | - $this->assertEquals( 'de', $this->object->getLanguageId() ); |
|
131 | + $this->object->setLanguageId('de'); |
|
132 | + $this->assertEquals('de', $this->object->getLanguageId()); |
|
133 | 133 | } |
134 | 134 | |
135 | 135 | |
136 | 136 | public function testGetSetTelephone() |
137 | 137 | { |
138 | - $this->object->setTelephone( '089123456789' ); |
|
139 | - $this->assertEquals( '089123456789', $this->object->getTelephone() ); |
|
138 | + $this->object->setTelephone('089123456789'); |
|
139 | + $this->assertEquals('089123456789', $this->object->getTelephone()); |
|
140 | 140 | } |
141 | 141 | |
142 | 142 | |
143 | 143 | public function testGetSetTelefax() |
144 | 144 | { |
145 | - $this->object->setTelefax( '089987654321' ); |
|
146 | - $this->assertEquals( '089987654321', $this->object->getTelefax() ); |
|
145 | + $this->object->setTelefax('089987654321'); |
|
146 | + $this->assertEquals('089987654321', $this->object->getTelefax()); |
|
147 | 147 | } |
148 | 148 | |
149 | 149 | |
150 | 150 | public function testGetSetWebsite() |
151 | 151 | { |
152 | - $this->object->setWebsite( 'http://aimeos.org' ); |
|
153 | - $this->assertEquals( 'http://aimeos.org', $this->object->getWebsite() ); |
|
152 | + $this->object->setWebsite('http://aimeos.org'); |
|
153 | + $this->assertEquals('http://aimeos.org', $this->object->getWebsite()); |
|
154 | 154 | } |
155 | 155 | |
156 | 156 | |
@@ -159,6 +159,6 @@ discard block |
||
159 | 159 | */ |
160 | 160 | public function testSetWebsiteInvalid() |
161 | 161 | { |
162 | - $this->object->setWebsite( 'aimeos+org' ); |
|
162 | + $this->object->setWebsite('aimeos+org'); |
|
163 | 163 | } |
164 | 164 | } |
@@ -19,50 +19,50 @@ |
||
19 | 19 | |
20 | 20 | public function testGetId() |
21 | 21 | { |
22 | - $this->assertEquals( null, $this->object->getId() ); |
|
22 | + $this->assertEquals(null, $this->object->getId()); |
|
23 | 23 | } |
24 | 24 | |
25 | 25 | |
26 | 26 | public function testGetUsername() |
27 | 27 | { |
28 | - $this->assertEquals( null, $this->object->getUsername() ); |
|
28 | + $this->assertEquals(null, $this->object->getUsername()); |
|
29 | 29 | } |
30 | 30 | |
31 | 31 | |
32 | 32 | public function testGetPassword() |
33 | 33 | { |
34 | - $this->assertEquals( null, $this->object->getPassword() ); |
|
34 | + $this->assertEquals(null, $this->object->getPassword()); |
|
35 | 35 | } |
36 | 36 | |
37 | 37 | |
38 | 38 | public function testGetSalt() |
39 | 39 | { |
40 | - $this->assertEquals( 'mshop', $this->object->getSalt() ); |
|
40 | + $this->assertEquals('mshop', $this->object->getSalt()); |
|
41 | 41 | } |
42 | 42 | |
43 | 43 | |
44 | 44 | public function testGetRoles() |
45 | 45 | { |
46 | - $this->assertEquals( array( 'ROLE_USER' ), $this->object->getRoles() ); |
|
46 | + $this->assertEquals(array('ROLE_USER'), $this->object->getRoles()); |
|
47 | 47 | } |
48 | 48 | |
49 | 49 | |
50 | 50 | public function testEraseCredentials() |
51 | 51 | { |
52 | 52 | $this->object->eraseCredentials(); |
53 | - $this->assertNull( $this->object->getPassword() ); |
|
53 | + $this->assertNull($this->object->getPassword()); |
|
54 | 54 | } |
55 | 55 | |
56 | 56 | |
57 | 57 | public function testSerialize() |
58 | 58 | { |
59 | - $this->assertEquals( 'a:3:{i:0;N;i:1;N;i:2;N;}', $this->object->serialize() ); |
|
59 | + $this->assertEquals('a:3:{i:0;N;i:1;N;i:2;N;}', $this->object->serialize()); |
|
60 | 60 | } |
61 | 61 | |
62 | 62 | |
63 | 63 | public function testUnserialize() |
64 | 64 | { |
65 | - $this->object->unserialize( 'a:3:{i:0;N;i:1;N;i:2;N;}' ); |
|
66 | - $this->assertNull( $this->object->getId() ); |
|
65 | + $this->object->unserialize('a:3:{i:0;N;i:1;N;i:2;N;}'); |
|
66 | + $this->assertNull($this->object->getId()); |
|
67 | 67 | } |
68 | 68 | } |