@@ -29,19 +29,19 @@ discard block |
||
29 | 29 | protected function configure() |
30 | 30 | { |
31 | 31 | $names = ''; |
32 | - $aimeos = new \Aimeos\Bootstrap( array() ); |
|
33 | - $cntlPaths = $aimeos->getCustomPaths( 'controller/jobs' ); |
|
34 | - $controllers = \Aimeos\Controller\Jobs\Factory::getControllers( $this->getBareContext(), $aimeos, $cntlPaths ); |
|
32 | + $aimeos = new \Aimeos\Bootstrap(array()); |
|
33 | + $cntlPaths = $aimeos->getCustomPaths('controller/jobs'); |
|
34 | + $controllers = \Aimeos\Controller\Jobs\Factory::getControllers($this->getBareContext(), $aimeos, $cntlPaths); |
|
35 | 35 | |
36 | - foreach( $controllers as $key => $controller ) { |
|
37 | - $names .= str_pad( $key, 30 ) . $controller->getName() . PHP_EOL; |
|
36 | + foreach ($controllers as $key => $controller) { |
|
37 | + $names .= str_pad($key, 30).$controller->getName().PHP_EOL; |
|
38 | 38 | } |
39 | 39 | |
40 | - $this->setName( 'aimeos:jobs' ); |
|
41 | - $this->setDescription( 'Executes the job controllers' ); |
|
42 | - $this->addArgument( 'jobs', InputArgument::REQUIRED, 'One or more job controller names like "admin/job customer/email/watch"' ); |
|
43 | - $this->addArgument( 'site', InputArgument::OPTIONAL, 'Site codes to execute the jobs for like "default unittest" (none for all)' ); |
|
44 | - $this->setHelp( "Available jobs are:\n" . $names ); |
|
40 | + $this->setName('aimeos:jobs'); |
|
41 | + $this->setDescription('Executes the job controllers'); |
|
42 | + $this->addArgument('jobs', InputArgument::REQUIRED, 'One or more job controller names like "admin/job customer/email/watch"'); |
|
43 | + $this->addArgument('site', InputArgument::OPTIONAL, 'Site codes to execute the jobs for like "default unittest" (none for all)'); |
|
44 | + $this->setHelp("Available jobs are:\n".$names); |
|
45 | 45 | } |
46 | 46 | |
47 | 47 | |
@@ -51,32 +51,32 @@ discard block |
||
51 | 51 | * @param InputInterface $input Input object |
52 | 52 | * @param OutputInterface $output Output object |
53 | 53 | */ |
54 | - protected function execute( InputInterface $input, OutputInterface $output ) |
|
54 | + protected function execute(InputInterface $input, OutputInterface $output) |
|
55 | 55 | { |
56 | 56 | $context = $this->getContext(); |
57 | 57 | $process = $context->getProcess(); |
58 | - $aimeos = $this->getContainer()->get( 'aimeos' )->get(); |
|
58 | + $aimeos = $this->getContainer()->get('aimeos')->get(); |
|
59 | 59 | |
60 | - $jobs = explode( ' ', $input->getArgument( 'jobs' ) ); |
|
61 | - $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context ); |
|
60 | + $jobs = explode(' ', $input->getArgument('jobs')); |
|
61 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context); |
|
62 | 62 | |
63 | - foreach( $this->getSiteItems( $context, $input ) as $siteItem ) |
|
63 | + foreach ($this->getSiteItems($context, $input) as $siteItem) |
|
64 | 64 | { |
65 | - $localeItem = $localeManager->bootstrap( $siteItem->getCode(), '', '', false ); |
|
66 | - $localeItem->setLanguageId( null ); |
|
67 | - $localeItem->setCurrencyId( null ); |
|
65 | + $localeItem = $localeManager->bootstrap($siteItem->getCode(), '', '', false); |
|
66 | + $localeItem->setLanguageId(null); |
|
67 | + $localeItem->setCurrencyId(null); |
|
68 | 68 | |
69 | - $context->setLocale( $localeItem ); |
|
69 | + $context->setLocale($localeItem); |
|
70 | 70 | |
71 | - $output->writeln( sprintf( 'Executing the Aimeos jobs for "<info>%s</info>"', $siteItem->getCode() ) ); |
|
71 | + $output->writeln(sprintf('Executing the Aimeos jobs for "<info>%s</info>"', $siteItem->getCode())); |
|
72 | 72 | |
73 | - foreach( $jobs as $jobname ) |
|
73 | + foreach ($jobs as $jobname) |
|
74 | 74 | { |
75 | - $fcn = function( $context, $aimeos, $jobname ) { |
|
76 | - \Aimeos\Controller\Jobs\Factory::createController( $context, $aimeos, $jobname )->run(); |
|
75 | + $fcn = function($context, $aimeos, $jobname) { |
|
76 | + \Aimeos\Controller\Jobs\Factory::createController($context, $aimeos, $jobname)->run(); |
|
77 | 77 | }; |
78 | 78 | |
79 | - $process->start( $fcn, [$context, $aimeos, $jobname], true ); |
|
79 | + $process->start($fcn, [$context, $aimeos, $jobname], true); |
|
80 | 80 | } |
81 | 81 | } |
82 | 82 | |
@@ -93,15 +93,15 @@ discard block |
||
93 | 93 | { |
94 | 94 | $ctx = new \Aimeos\MShop\Context\Item\Standard(); |
95 | 95 | |
96 | - $conf = new \Aimeos\MW\Config\PHPArray( array(), array() ); |
|
97 | - $ctx->setConfig( $conf ); |
|
96 | + $conf = new \Aimeos\MW\Config\PHPArray(array(), array()); |
|
97 | + $ctx->setConfig($conf); |
|
98 | 98 | |
99 | - $locale = \Aimeos\MShop\Factory::createManager( $ctx, 'locale' )->createItem(); |
|
100 | - $locale->setLanguageId( 'en' ); |
|
101 | - $ctx->setLocale( $locale ); |
|
99 | + $locale = \Aimeos\MShop\Factory::createManager($ctx, 'locale')->createItem(); |
|
100 | + $locale->setLanguageId('en'); |
|
101 | + $ctx->setLocale($locale); |
|
102 | 102 | |
103 | - $i18n = new \Aimeos\MW\Translation\None( 'en' ); |
|
104 | - $ctx->setI18n( array( 'en' => $i18n ) ); |
|
103 | + $i18n = new \Aimeos\MW\Translation\None('en'); |
|
104 | + $ctx->setI18n(array('en' => $i18n)); |
|
105 | 105 | |
106 | 106 | return $ctx; |
107 | 107 | } |
@@ -116,19 +116,19 @@ discard block |
||
116 | 116 | { |
117 | 117 | $container = $this->getContainer(); |
118 | 118 | $aimeos = $container->get('aimeos')->get(); |
119 | - $context = $container->get( 'aimeos_context' )->get( false, 'command' ); |
|
119 | + $context = $container->get('aimeos_context')->get(false, 'command'); |
|
120 | 120 | |
121 | - $tmplPaths = $aimeos->getCustomPaths( 'controller/jobs/templates' ); |
|
122 | - $tmplPaths = array_merge( $tmplPaths, $aimeos->getCustomPaths( 'client/html/templates' ) ); |
|
123 | - $view = $container->get('aimeos_view')->create( $context, $tmplPaths ); |
|
121 | + $tmplPaths = $aimeos->getCustomPaths('controller/jobs/templates'); |
|
122 | + $tmplPaths = array_merge($tmplPaths, $aimeos->getCustomPaths('client/html/templates')); |
|
123 | + $view = $container->get('aimeos_view')->create($context, $tmplPaths); |
|
124 | 124 | |
125 | - $langManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $context )->getSubManager( 'language' ); |
|
126 | - $langids = array_keys( $langManager->searchItems( $langManager->createSearch( true ) ) ); |
|
127 | - $i18n = $this->getContainer()->get( 'aimeos_i18n' )->get( $langids ); |
|
125 | + $langManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($context)->getSubManager('language'); |
|
126 | + $langids = array_keys($langManager->searchItems($langManager->createSearch(true))); |
|
127 | + $i18n = $this->getContainer()->get('aimeos_i18n')->get($langids); |
|
128 | 128 | |
129 | - $context->setEditor( 'aimeos:jobs' ); |
|
130 | - $context->setView( $view ); |
|
131 | - $context->setI18n( $i18n ); |
|
129 | + $context->setEditor('aimeos:jobs'); |
|
130 | + $context->setView($view); |
|
131 | + $context->setI18n($i18n); |
|
132 | 132 | |
133 | 133 | return $context; |
134 | 134 | } |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | * Returns the initial HTML view for the admin interface. |
27 | 27 | * |
28 | 28 | * @param Request $request Symfony request object |
29 | - * @return Response Generated HTML page for the admin interface |
|
29 | + * @return \Symfony\Component\HttpFoundation\Response Generated HTML page for the admin interface |
|
30 | 30 | */ |
31 | 31 | public function indexAction( Request $request ) |
32 | 32 | { |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | /** |
59 | 59 | * Checks if the used is authenticated and has the admin role |
60 | 60 | * |
61 | - * @param array $roles List of role names where at least one must match |
|
61 | + * @param string[] $roles List of role names where at least one must match |
|
62 | 62 | * @return boolean True if authenticated and is admin, false if not |
63 | 63 | */ |
64 | 64 | protected function hasRole( array $roles ) |
@@ -28,36 +28,36 @@ discard block |
||
28 | 28 | * @param Request $request Symfony request object |
29 | 29 | * @return Response Generated HTML page for the admin interface |
30 | 30 | */ |
31 | - public function indexAction( Request $request ) |
|
31 | + public function indexAction(Request $request) |
|
32 | 32 | { |
33 | - if( $this->hasRole( ['ROLE_ADMIN', 'ROLE_SUPER_ADMIN'] ) ) |
|
33 | + if ($this->hasRole(['ROLE_ADMIN', 'ROLE_SUPER_ADMIN'])) |
|
34 | 34 | { |
35 | - $context = $this->get( 'aimeos_context' )->get( false ); |
|
36 | - $user = $this->get( 'security.token_storage' )->getToken()->getUser(); |
|
37 | - $siteManager = \Aimeos\MShop\Factory::createManager( $context, 'locale/site' ); |
|
38 | - $siteCode = ( $user->getSiteId() ? $siteManager->getItem( $user->getSiteId() )->getCode() : 'default' ); |
|
39 | - $locale = $user->getLanguageId() ?: $this->getParameter( 'locale' ); |
|
35 | + $context = $this->get('aimeos_context')->get(false); |
|
36 | + $user = $this->get('security.token_storage')->getToken()->getUser(); |
|
37 | + $siteManager = \Aimeos\MShop\Factory::createManager($context, 'locale/site'); |
|
38 | + $siteCode = ($user->getSiteId() ? $siteManager->getItem($user->getSiteId())->getCode() : 'default'); |
|
39 | + $locale = $user->getLanguageId() ?: $this->getParameter('locale'); |
|
40 | 40 | |
41 | 41 | $params = array( |
42 | 42 | 'resource' => 'dashboard', |
43 | - 'site' => $request->attributes->get( 'site', $request->query->get( 'site', $siteCode ) ), |
|
44 | - 'lang' => $request->attributes->get( 'lang', $request->query->get( 'lang', $locale ) ), |
|
43 | + 'site' => $request->attributes->get('site', $request->query->get('site', $siteCode)), |
|
44 | + 'lang' => $request->attributes->get('lang', $request->query->get('lang', $locale)), |
|
45 | 45 | ); |
46 | - return $this->redirect( $this->generateUrl( 'aimeos_shop_jqadm_search', $params ) ); |
|
46 | + return $this->redirect($this->generateUrl('aimeos_shop_jqadm_search', $params)); |
|
47 | 47 | } |
48 | 48 | |
49 | 49 | |
50 | - $param = array( 'error' => '', 'username' => '' ); |
|
50 | + $param = array('error' => '', 'username' => ''); |
|
51 | 51 | |
52 | - if( $this->has( 'security.authentication_utils' ) ) |
|
52 | + if ($this->has('security.authentication_utils')) |
|
53 | 53 | { |
54 | - $auth = $this->get( 'security.authentication_utils' ); |
|
54 | + $auth = $this->get('security.authentication_utils'); |
|
55 | 55 | |
56 | 56 | $param['error'] = $auth->getLastAuthenticationError(); |
57 | 57 | $param['username'] = $auth->getLastUsername(); |
58 | 58 | } |
59 | 59 | |
60 | - return $this->render( 'AimeosShopBundle:Admin:index.html.twig', $param ); |
|
60 | + return $this->render('AimeosShopBundle:Admin:index.html.twig', $param); |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | |
@@ -67,15 +67,15 @@ discard block |
||
67 | 67 | * @param array $roles List of role names where at least one must match |
68 | 68 | * @return boolean True if authenticated and is admin, false if not |
69 | 69 | */ |
70 | - protected function hasRole( array $roles ) |
|
70 | + protected function hasRole(array $roles) |
|
71 | 71 | { |
72 | - if( $this->has( 'security.authorization_checker' ) && $this->get( 'security.token_storage' )->getToken() ) |
|
72 | + if ($this->has('security.authorization_checker') && $this->get('security.token_storage')->getToken()) |
|
73 | 73 | { |
74 | - $checker = $this->get( 'security.authorization_checker' ); |
|
74 | + $checker = $this->get('security.authorization_checker'); |
|
75 | 75 | |
76 | - foreach( $roles as $role ) |
|
76 | + foreach ($roles as $role) |
|
77 | 77 | { |
78 | - if( $checker->isGranted( $role ) ) { |
|
78 | + if ($checker->isGranted($role)) { |
|
79 | 79 | return true; |
80 | 80 | } |
81 | 81 | } |
@@ -11,10 +11,10 @@ |
||
11 | 11 | { |
12 | 12 | $client = static::createClient(); |
13 | 13 | |
14 | - $client->request( 'GET', '/admin' ); |
|
14 | + $client->request('GET', '/admin'); |
|
15 | 15 | $response = $client->getResponse(); |
16 | 16 | |
17 | - $this->assertEquals( 200, $response->getStatusCode() ); |
|
18 | - $this->assertContains( '<form class="login"', $response->getContent() ); |
|
17 | + $this->assertEquals(200, $response->getStatusCode()); |
|
18 | + $this->assertContains('<form class="login"', $response->getContent()); |
|
19 | 19 | } |
20 | 20 | } |
@@ -28,18 +28,18 @@ discard block |
||
28 | 28 | * @param Event $event Event instance |
29 | 29 | * @throws \RuntimeException If an error occured |
30 | 30 | */ |
31 | - public static function setupDatabase( Event $event ) |
|
31 | + public static function setupDatabase(Event $event) |
|
32 | 32 | { |
33 | 33 | $options = $env = array(); |
34 | 34 | |
35 | - if( $event->isDevMode() ) { |
|
35 | + if ($event->isDevMode()) { |
|
36 | 36 | $options[] = '--option=setup/default/demo:1'; |
37 | 37 | } else { |
38 | 38 | $env[] = '--env=prod'; |
39 | 39 | } |
40 | 40 | |
41 | - self::executeCommand( $event, 'aimeos:setup', $options + $env ); |
|
42 | - self::executeCommand( $event, 'aimeos:cache', $env ); |
|
41 | + self::executeCommand($event, 'aimeos:setup', $options + $env); |
|
42 | + self::executeCommand($event, 'aimeos:cache', $env); |
|
43 | 43 | } |
44 | 44 | |
45 | 45 | |
@@ -49,20 +49,20 @@ discard block |
||
49 | 49 | * @param Event $event Event instance |
50 | 50 | * @throws \RuntimeException If an error occured |
51 | 51 | */ |
52 | - public static function updateConfig( Event $event ) |
|
52 | + public static function updateConfig(Event $event) |
|
53 | 53 | { |
54 | - $event->getIO()->write( 'Ensure existing config and routing for the shop bundle' ); |
|
54 | + $event->getIO()->write('Ensure existing config and routing for the shop bundle'); |
|
55 | 55 | |
56 | - $options = self::getOptions( $event ); |
|
56 | + $options = self::getOptions($event); |
|
57 | 57 | |
58 | - if( !isset( $options['symfony-app-dir'] ) || !is_dir( $options['symfony-app-dir'] ) ) |
|
58 | + if (!isset($options['symfony-app-dir']) || !is_dir($options['symfony-app-dir'])) |
|
59 | 59 | { |
60 | 60 | $msg = 'An error occurred because the "%1$s" option or the "%2$s" directory isn\'t available'; |
61 | - throw new \RuntimeException( sprintf( $msg, 'symfony-app-dir', $options['symfony-app-dir'] ) ); |
|
61 | + throw new \RuntimeException(sprintf($msg, 'symfony-app-dir', $options['symfony-app-dir'])); |
|
62 | 62 | } |
63 | 63 | |
64 | - self::updateConfigFile( $options['symfony-app-dir'] . '/config/config.yml' ); |
|
65 | - self::updateRoutingFile( $options['symfony-app-dir'] . '/config/routing.yml' ); |
|
64 | + self::updateConfigFile($options['symfony-app-dir'].'/config/config.yml'); |
|
65 | + self::updateRoutingFile($options['symfony-app-dir'].'/config/routing.yml'); |
|
66 | 66 | } |
67 | 67 | |
68 | 68 | |
@@ -72,28 +72,28 @@ discard block |
||
72 | 72 | * @param Event $event Event instance |
73 | 73 | * @throws \RuntimeException If an error occured |
74 | 74 | */ |
75 | - public static function installBundle( Event $event ) |
|
75 | + public static function installBundle(Event $event) |
|
76 | 76 | { |
77 | - $event->getIO()->write( 'Installing the Aimeos shop bundle' ); |
|
77 | + $event->getIO()->write('Installing the Aimeos shop bundle'); |
|
78 | 78 | |
79 | - $options = self::getOptions( $event ); |
|
79 | + $options = self::getOptions($event); |
|
80 | 80 | |
81 | - if( !isset( $options['symfony-app-dir'] ) || !is_dir( $options['symfony-app-dir'] ) ) |
|
81 | + if (!isset($options['symfony-app-dir']) || !is_dir($options['symfony-app-dir'])) |
|
82 | 82 | { |
83 | 83 | $msg = 'An error occurred because the "%1$s" option or the "%2$s" directory isn\'t available'; |
84 | - throw new \RuntimeException( sprintf( $msg, 'symfony-app-dir', $options['symfony-app-dir'] ) ); |
|
84 | + throw new \RuntimeException(sprintf($msg, 'symfony-app-dir', $options['symfony-app-dir'])); |
|
85 | 85 | } |
86 | 86 | |
87 | - if( !isset( $options['symfony-web-dir'] ) || !is_dir( $options['symfony-web-dir'] ) ) |
|
87 | + if (!isset($options['symfony-web-dir']) || !is_dir($options['symfony-web-dir'])) |
|
88 | 88 | { |
89 | 89 | $msg = 'An error occurred because the "%1$s" option or the "%2$s" directory isn\'t available'; |
90 | - throw new \RuntimeException( sprintf( $msg, 'symfony-web-dir', $options['symfony-web-dir'] ) ); |
|
90 | + throw new \RuntimeException(sprintf($msg, 'symfony-web-dir', $options['symfony-web-dir'])); |
|
91 | 91 | } |
92 | 92 | |
93 | - self::createDirectory( $options['symfony-app-dir'] . '/secure' ); |
|
94 | - self::createDirectory( $options['symfony-web-dir'] . '/uploads' ); |
|
95 | - self::createDirectory( $options['symfony-web-dir'] . '/preview' ); |
|
96 | - self::createDirectory( $options['symfony-web-dir'] . '/files' ); |
|
93 | + self::createDirectory($options['symfony-app-dir'].'/secure'); |
|
94 | + self::createDirectory($options['symfony-web-dir'].'/uploads'); |
|
95 | + self::createDirectory($options['symfony-web-dir'].'/preview'); |
|
96 | + self::createDirectory($options['symfony-web-dir'].'/files'); |
|
97 | 97 | } |
98 | 98 | |
99 | 99 | |
@@ -103,14 +103,14 @@ discard block |
||
103 | 103 | * @param string $dir Absolute path of the new directory |
104 | 104 | * @throws \RuntimeException If directory couldn't be created |
105 | 105 | */ |
106 | - protected static function createDirectory( $dir ) |
|
106 | + protected static function createDirectory($dir) |
|
107 | 107 | { |
108 | 108 | $perm = 0755; |
109 | 109 | |
110 | - if( !is_dir( $dir ) && !mkdir( $dir, $perm, true ) ) |
|
110 | + if (!is_dir($dir) && !mkdir($dir, $perm, true)) |
|
111 | 111 | { |
112 | 112 | $msg = 'Unable to create directory "%1$s" with permission "%2$s"'; |
113 | - throw new \RuntimeException( sprintf( $msg, $dir, $perm ) ); |
|
113 | + throw new \RuntimeException(sprintf($msg, $dir, $perm)); |
|
114 | 114 | } |
115 | 115 | } |
116 | 116 | |
@@ -123,28 +123,28 @@ discard block |
||
123 | 123 | * @param array List of configuration options for the given command |
124 | 124 | * @throws \RuntimeException If the command couldn't be executed |
125 | 125 | */ |
126 | - protected static function executeCommand( Event $event, $cmd, array $options = array() ) |
|
126 | + protected static function executeCommand(Event $event, $cmd, array $options = array()) |
|
127 | 127 | { |
128 | - $php = escapeshellarg( self::getPhp() ); |
|
129 | - $console = escapeshellarg( self::getConsoleDir( $event ) . '/console' ); |
|
130 | - $cmd = escapeshellarg( $cmd ); |
|
128 | + $php = escapeshellarg(self::getPhp()); |
|
129 | + $console = escapeshellarg(self::getConsoleDir($event).'/console'); |
|
130 | + $cmd = escapeshellarg($cmd); |
|
131 | 131 | |
132 | - foreach( $options as $key => $option ) { |
|
133 | - $options[$key] = escapeshellarg( $option ); |
|
132 | + foreach ($options as $key => $option) { |
|
133 | + $options[$key] = escapeshellarg($option); |
|
134 | 134 | } |
135 | 135 | |
136 | - if( $event->getIO()->isDecorated() ) { |
|
136 | + if ($event->getIO()->isDecorated()) { |
|
137 | 137 | $console .= ' --ansi'; |
138 | 138 | } |
139 | 139 | |
140 | - $process = new Process( $php . ' ' . $console . ' ' . $cmd . ' ' . implode( ' ', $options ), null, null, null, 3600 ); |
|
140 | + $process = new Process($php.' '.$console.' '.$cmd.' '.implode(' ', $options), null, null, null, 3600); |
|
141 | 141 | |
142 | - $process->run( function( $type, $buffer ) use ( $event ) { |
|
143 | - $event->getIO()->write( $buffer, false ); |
|
142 | + $process->run(function($type, $buffer) use ($event) { |
|
143 | + $event->getIO()->write($buffer, false); |
|
144 | 144 | } ); |
145 | 145 | |
146 | - if( !$process->isSuccessful() ) { |
|
147 | - throw new \RuntimeException( sprintf( 'An error occurred when executing the "%s" command', escapeshellarg( $cmd ) ) ); |
|
146 | + if (!$process->isSuccessful()) { |
|
147 | + throw new \RuntimeException(sprintf('An error occurred when executing the "%s" command', escapeshellarg($cmd))); |
|
148 | 148 | } |
149 | 149 | } |
150 | 150 | |
@@ -157,19 +157,19 @@ discard block |
||
157 | 157 | * @return string The path to the console directory |
158 | 158 | * @throws \RuntimeException If console directory couldn't be found |
159 | 159 | */ |
160 | - protected static function getConsoleDir( Event $event ) |
|
160 | + protected static function getConsoleDir(Event $event) |
|
161 | 161 | { |
162 | - $options = self::getOptions( $event ); |
|
162 | + $options = self::getOptions($event); |
|
163 | 163 | |
164 | - if( isset( $options['symfony-bin-dir'] ) && is_dir( $options['symfony-bin-dir'] ) ) { |
|
164 | + if (isset($options['symfony-bin-dir']) && is_dir($options['symfony-bin-dir'])) { |
|
165 | 165 | return $options['symfony-bin-dir']; |
166 | 166 | } |
167 | 167 | |
168 | - if( isset( $options['symfony-app-dir'] ) && is_dir( $options['symfony-app-dir'] ) ) { |
|
168 | + if (isset($options['symfony-app-dir']) && is_dir($options['symfony-app-dir'])) { |
|
169 | 169 | return $options['symfony-app-dir']; |
170 | 170 | } |
171 | 171 | |
172 | - throw new \RuntimeException( sprintf( 'Console directory not found. Neither %1$s nor %2$s option exist', 'symfony-app-dir', 'symfony-bin-dir' ) ); |
|
172 | + throw new \RuntimeException(sprintf('Console directory not found. Neither %1$s nor %2$s option exist', 'symfony-app-dir', 'symfony-bin-dir')); |
|
173 | 173 | } |
174 | 174 | |
175 | 175 | |
@@ -179,7 +179,7 @@ discard block |
||
179 | 179 | * @param Event $event Command event object |
180 | 180 | * @return array Associative list of option keys and values |
181 | 181 | */ |
182 | - protected static function getOptions( Event $event ) |
|
182 | + protected static function getOptions(Event $event) |
|
183 | 183 | { |
184 | 184 | return $event->getComposer()->getPackage()->getExtra(); |
185 | 185 | } |
@@ -195,8 +195,8 @@ discard block |
||
195 | 195 | { |
196 | 196 | $phpFinder = new PhpExecutableFinder; |
197 | 197 | |
198 | - if( !( $phpPath = $phpFinder->find() ) ) { |
|
199 | - throw new \RuntimeException( 'The php executable could not be found, add it to your PATH environment variable and try again' ); |
|
198 | + if (!($phpPath = $phpFinder->find())) { |
|
199 | + throw new \RuntimeException('The php executable could not be found, add it to your PATH environment variable and try again'); |
|
200 | 200 | } |
201 | 201 | |
202 | 202 | return $phpPath; |
@@ -209,15 +209,15 @@ discard block |
||
209 | 209 | * @param string $filename Name of the YAML config file |
210 | 210 | * @throws \RuntimeException If file is not found |
211 | 211 | */ |
212 | - protected static function updateConfigFile( $filename ) |
|
212 | + protected static function updateConfigFile($filename) |
|
213 | 213 | { |
214 | - if( ( $content = file_get_contents( $filename ) ) === false ) { |
|
215 | - throw new \RuntimeException( sprintf( 'File "%1$s" not found', $filename ) ); |
|
214 | + if (($content = file_get_contents($filename)) === false) { |
|
215 | + throw new \RuntimeException(sprintf('File "%1$s" not found', $filename)); |
|
216 | 216 | } |
217 | 217 | |
218 | - if( self::addAsseticBundle( $content ) === true ) { |
|
218 | + if (self::addAsseticBundle($content) === true) { |
|
219 | 219 | $fs = new Filesystem(); |
220 | - $fs->dumpFile( $filename, $content ); |
|
220 | + $fs->dumpFile($filename, $content); |
|
221 | 221 | } |
222 | 222 | } |
223 | 223 | |
@@ -228,21 +228,21 @@ discard block |
||
228 | 228 | * @param string $filename Name of the YAML config file |
229 | 229 | * @throws \RuntimeException If file is not found |
230 | 230 | */ |
231 | - protected static function updateRoutingFile( $filename ) |
|
231 | + protected static function updateRoutingFile($filename) |
|
232 | 232 | { |
233 | - if( ( $content = file_get_contents( $filename ) ) === false ) { |
|
234 | - throw new \RuntimeException( sprintf( 'File "%1$s" not found', $filename ) ); |
|
233 | + if (($content = file_get_contents($filename)) === false) { |
|
234 | + throw new \RuntimeException(sprintf('File "%1$s" not found', $filename)); |
|
235 | 235 | } |
236 | 236 | |
237 | - if( strpos( $content, 'aimeos_shop:' ) === false ) |
|
237 | + if (strpos($content, 'aimeos_shop:') === false) |
|
238 | 238 | { |
239 | - $content .= "\n" . 'aimeos_shop: |
|
239 | + $content .= "\n".'aimeos_shop: |
|
240 | 240 | resource: "@AimeosShopBundle/Resources/config/routing.yml" |
241 | 241 | prefix: /'; |
242 | 242 | } |
243 | 243 | |
244 | 244 | $fs = new Filesystem(); |
245 | - $fs->dumpFile( $filename, $content ); |
|
245 | + $fs->dumpFile($filename, $content); |
|
246 | 246 | } |
247 | 247 | |
248 | 248 | |
@@ -252,14 +252,14 @@ discard block |
||
252 | 252 | * @param string &$content Content of the config.yml file |
253 | 253 | * @return boolean True if modified, false if not |
254 | 254 | */ |
255 | - protected static function addAsseticBundle( &$content ) |
|
255 | + protected static function addAsseticBundle(&$content) |
|
256 | 256 | { |
257 | - if( preg_match( "/ bundles:[ ]*\[.*'AimeosShopBundle'.*\]/", $content ) !== 1 ) |
|
257 | + if (preg_match("/ bundles:[ ]*\[.*'AimeosShopBundle'.*\]/", $content) !== 1) |
|
258 | 258 | { |
259 | - $search = array( "/ bundles:[ ]*\[([^\]]+)\]/", "/ bundles:[ ]*\[([ ]*)\]/" ); |
|
260 | - $replace = array( " bundles: [$1,'AimeosShopBundle']", " bundles: ['AimeosShopBundle']" ); |
|
259 | + $search = array("/ bundles:[ ]*\[([^\]]+)\]/", "/ bundles:[ ]*\[([ ]*)\]/"); |
|
260 | + $replace = array(" bundles: [$1,'AimeosShopBundle']", " bundles: ['AimeosShopBundle']"); |
|
261 | 261 | |
262 | - if( ( $content = preg_replace( $search, $replace, $content ) ) !== null ) { |
|
262 | + if (($content = preg_replace($search, $replace, $content)) !== null) { |
|
263 | 263 | return true; |
264 | 264 | } |
265 | 265 | } |
@@ -11,72 +11,72 @@ |
||
11 | 11 | public function testAccount() |
12 | 12 | { |
13 | 13 | $client = static::createClient(); |
14 | - $client->request( 'GET', '/unittest/de/EUR/myaccount/' ); |
|
14 | + $client->request('GET', '/unittest/de/EUR/myaccount/'); |
|
15 | 15 | |
16 | - $this->assertContains( 'aimeos account-profile', $client->getResponse()->getContent() ); |
|
17 | - $this->assertContains( 'aimeos account-history', $client->getResponse()->getContent() ); |
|
18 | - $this->assertContains( 'aimeos account-favorite', $client->getResponse()->getContent() ); |
|
19 | - $this->assertContains( 'aimeos account-watch', $client->getResponse()->getContent() ); |
|
16 | + $this->assertContains('aimeos account-profile', $client->getResponse()->getContent()); |
|
17 | + $this->assertContains('aimeos account-history', $client->getResponse()->getContent()); |
|
18 | + $this->assertContains('aimeos account-favorite', $client->getResponse()->getContent()); |
|
19 | + $this->assertContains('aimeos account-watch', $client->getResponse()->getContent()); |
|
20 | 20 | } |
21 | 21 | |
22 | 22 | |
23 | 23 | public function testDownload() |
24 | 24 | { |
25 | 25 | $client = static::createClient(); |
26 | - $client->request( 'GET', '/unittest/de/EUR/myaccount/download/0' ); |
|
26 | + $client->request('GET', '/unittest/de/EUR/myaccount/download/0'); |
|
27 | 27 | |
28 | - $this->assertEquals( 401, $client->getResponse()->getStatusCode() ); |
|
28 | + $this->assertEquals(401, $client->getResponse()->getStatusCode()); |
|
29 | 29 | } |
30 | 30 | |
31 | 31 | |
32 | 32 | public function testFavoriteComponent() |
33 | 33 | { |
34 | 34 | $client = static::createClient(); |
35 | - $client->request( 'GET', '/unittest/de/EUR/test/favoritecomponent' ); |
|
35 | + $client->request('GET', '/unittest/de/EUR/test/favoritecomponent'); |
|
36 | 36 | |
37 | - $this->assertEquals( 200, $client->getResponse()->getStatusCode() ); |
|
38 | - $this->assertContains( 'aimeos account-favorite', $client->getResponse()->getContent() ); |
|
37 | + $this->assertEquals(200, $client->getResponse()->getStatusCode()); |
|
38 | + $this->assertContains('aimeos account-favorite', $client->getResponse()->getContent()); |
|
39 | 39 | } |
40 | 40 | |
41 | 41 | |
42 | 42 | public function testHistoryComponent() |
43 | 43 | { |
44 | - $mock = $this->getMockBuilder( 'Aimeos\ShopBundle\Controller\AccountController' ) |
|
45 | - ->setMethods( array( 'getOutput' ) ) |
|
44 | + $mock = $this->getMockBuilder('Aimeos\ShopBundle\Controller\AccountController') |
|
45 | + ->setMethods(array('getOutput')) |
|
46 | 46 | ->disableOriginalConstructor() |
47 | 47 | ->getMock(); |
48 | 48 | |
49 | - $response = Response::create( 'test' ); |
|
50 | - $mock->expects( $this->once() )->method( 'getOutput' )->will( $this->returnValue( $response ) ); |
|
49 | + $response = Response::create('test'); |
|
50 | + $mock->expects($this->once())->method('getOutput')->will($this->returnValue($response)); |
|
51 | 51 | |
52 | - $this->assertSame( $response, $mock->historyComponentAction() ); |
|
52 | + $this->assertSame($response, $mock->historyComponentAction()); |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | |
56 | 56 | public function testProfileComponent() |
57 | 57 | { |
58 | - $mock = $this->getMockBuilder( 'Aimeos\ShopBundle\Controller\AccountController' ) |
|
59 | - ->setMethods( array( 'getOutput' ) ) |
|
58 | + $mock = $this->getMockBuilder('Aimeos\ShopBundle\Controller\AccountController') |
|
59 | + ->setMethods(array('getOutput')) |
|
60 | 60 | ->disableOriginalConstructor() |
61 | 61 | ->getMock(); |
62 | 62 | |
63 | - $response = Response::create( 'test' ); |
|
64 | - $mock->expects( $this->once() )->method( 'getOutput' )->will( $this->returnValue( $response ) ); |
|
63 | + $response = Response::create('test'); |
|
64 | + $mock->expects($this->once())->method('getOutput')->will($this->returnValue($response)); |
|
65 | 65 | |
66 | - $this->assertSame( $response, $mock->profileComponentAction() ); |
|
66 | + $this->assertSame($response, $mock->profileComponentAction()); |
|
67 | 67 | } |
68 | 68 | |
69 | 69 | |
70 | 70 | public function testWatchComponent() |
71 | 71 | { |
72 | - $mock = $this->getMockBuilder( 'Aimeos\ShopBundle\Controller\AccountController' ) |
|
73 | - ->setMethods( array( 'getOutput' ) ) |
|
72 | + $mock = $this->getMockBuilder('Aimeos\ShopBundle\Controller\AccountController') |
|
73 | + ->setMethods(array('getOutput')) |
|
74 | 74 | ->disableOriginalConstructor() |
75 | 75 | ->getMock(); |
76 | 76 | |
77 | - $response = Response::create( 'test' ); |
|
78 | - $mock->expects( $this->once() )->method( 'getOutput' )->will( $this->returnValue( $response ) ); |
|
77 | + $response = Response::create('test'); |
|
78 | + $mock->expects($this->once())->method('getOutput')->will($this->returnValue($response)); |
|
79 | 79 | |
80 | - $this->assertSame( $response, $mock->watchComponentAction() ); |
|
80 | + $this->assertSame($response, $mock->watchComponentAction()); |
|
81 | 81 | } |
82 | 82 | } |
@@ -12,12 +12,12 @@ discard block |
||
12 | 12 | $client = static::createClient(array(), array( |
13 | 13 | 'PHP_AUTH_USER' => 'admin', |
14 | 14 | 'PHP_AUTH_PW' => 'adminpass', |
15 | - ) ); |
|
15 | + )); |
|
16 | 16 | |
17 | - $client->request( 'GET', '/unittest/jqadm/file/css' ); |
|
17 | + $client->request('GET', '/unittest/jqadm/file/css'); |
|
18 | 18 | |
19 | - $this->assertEquals( 200, $client->getResponse()->getStatusCode() ); |
|
20 | - $this->assertContains( '.aimeos', $client->getResponse()->getContent() ); |
|
19 | + $this->assertEquals(200, $client->getResponse()->getStatusCode()); |
|
20 | + $this->assertContains('.aimeos', $client->getResponse()->getContent()); |
|
21 | 21 | } |
22 | 22 | |
23 | 23 | |
@@ -26,12 +26,12 @@ discard block |
||
26 | 26 | $client = static::createClient(array(), array( |
27 | 27 | 'PHP_AUTH_USER' => 'admin', |
28 | 28 | 'PHP_AUTH_PW' => 'adminpass', |
29 | - ) ); |
|
29 | + )); |
|
30 | 30 | |
31 | - $client->request( 'GET', '/unittest/jqadm/file/js' ); |
|
31 | + $client->request('GET', '/unittest/jqadm/file/js'); |
|
32 | 32 | |
33 | - $this->assertEquals( 200, $client->getResponse()->getStatusCode() ); |
|
34 | - $this->assertContains( 'Aimeos = {', $client->getResponse()->getContent() ); |
|
33 | + $this->assertEquals(200, $client->getResponse()->getStatusCode()); |
|
34 | + $this->assertContains('Aimeos = {', $client->getResponse()->getContent()); |
|
35 | 35 | } |
36 | 36 | |
37 | 37 | |
@@ -40,13 +40,13 @@ discard block |
||
40 | 40 | $client = static::createClient(array(), array( |
41 | 41 | 'PHP_AUTH_USER' => 'admin', |
42 | 42 | 'PHP_AUTH_PW' => 'adminpass', |
43 | - ) ); |
|
43 | + )); |
|
44 | 44 | |
45 | - $client->request( 'GET', '/unittest/jqadm/copy/product/0' ); |
|
45 | + $client->request('GET', '/unittest/jqadm/copy/product/0'); |
|
46 | 46 | $response = $client->getResponse(); |
47 | 47 | |
48 | - $this->assertEquals( 200, $response->getStatusCode() ); |
|
49 | - $this->assertContains( 'item-product', $response->getContent() ); |
|
48 | + $this->assertEquals(200, $response->getStatusCode()); |
|
49 | + $this->assertContains('item-product', $response->getContent()); |
|
50 | 50 | } |
51 | 51 | |
52 | 52 | |
@@ -55,13 +55,13 @@ discard block |
||
55 | 55 | $client = static::createClient(array(), array( |
56 | 56 | 'PHP_AUTH_USER' => 'admin', |
57 | 57 | 'PHP_AUTH_PW' => 'adminpass', |
58 | - ) ); |
|
58 | + )); |
|
59 | 59 | |
60 | - $client->request( 'GET', '/unittest/jqadm/create/product' ); |
|
60 | + $client->request('GET', '/unittest/jqadm/create/product'); |
|
61 | 61 | $response = $client->getResponse(); |
62 | 62 | |
63 | - $this->assertEquals( 200, $response->getStatusCode() ); |
|
64 | - $this->assertContains( 'item-product', $response->getContent() ); |
|
63 | + $this->assertEquals(200, $response->getStatusCode()); |
|
64 | + $this->assertContains('item-product', $response->getContent()); |
|
65 | 65 | } |
66 | 66 | |
67 | 67 | |
@@ -70,13 +70,13 @@ discard block |
||
70 | 70 | $client = static::createClient(array(), array( |
71 | 71 | 'PHP_AUTH_USER' => 'admin', |
72 | 72 | 'PHP_AUTH_PW' => 'adminpass', |
73 | - ) ); |
|
73 | + )); |
|
74 | 74 | |
75 | - $client->request( 'GET', '/unittest/jqadm/delete/product/0' ); |
|
75 | + $client->request('GET', '/unittest/jqadm/delete/product/0'); |
|
76 | 76 | $response = $client->getResponse(); |
77 | 77 | |
78 | - $this->assertEquals( 200, $response->getStatusCode() ); |
|
79 | - $this->assertContains( 'list-items', $response->getContent() ); |
|
78 | + $this->assertEquals(200, $response->getStatusCode()); |
|
79 | + $this->assertContains('list-items', $response->getContent()); |
|
80 | 80 | } |
81 | 81 | |
82 | 82 | |
@@ -85,13 +85,13 @@ discard block |
||
85 | 85 | $client = static::createClient(array(), array( |
86 | 86 | 'PHP_AUTH_USER' => 'admin', |
87 | 87 | 'PHP_AUTH_PW' => 'adminpass', |
88 | - ) ); |
|
88 | + )); |
|
89 | 89 | |
90 | - $client->request( 'GET', '/unittest/jqadm/export/order' ); |
|
90 | + $client->request('GET', '/unittest/jqadm/export/order'); |
|
91 | 91 | $response = $client->getResponse(); |
92 | 92 | |
93 | - $this->assertEquals( 200, $response->getStatusCode() ); |
|
94 | - $this->assertContains( 'list-items', $response->getContent() ); |
|
93 | + $this->assertEquals(200, $response->getStatusCode()); |
|
94 | + $this->assertContains('list-items', $response->getContent()); |
|
95 | 95 | } |
96 | 96 | |
97 | 97 | |
@@ -100,13 +100,13 @@ discard block |
||
100 | 100 | $client = static::createClient(array(), array( |
101 | 101 | 'PHP_AUTH_USER' => 'admin', |
102 | 102 | 'PHP_AUTH_PW' => 'adminpass', |
103 | - ) ); |
|
103 | + )); |
|
104 | 104 | |
105 | - $client->request( 'GET', '/unittest/jqadm/get/product/0' ); |
|
105 | + $client->request('GET', '/unittest/jqadm/get/product/0'); |
|
106 | 106 | $response = $client->getResponse(); |
107 | 107 | |
108 | - $this->assertEquals( 200, $response->getStatusCode() ); |
|
109 | - $this->assertContains( 'item-product', $response->getContent() ); |
|
108 | + $this->assertEquals(200, $response->getStatusCode()); |
|
109 | + $this->assertContains('item-product', $response->getContent()); |
|
110 | 110 | } |
111 | 111 | |
112 | 112 | |
@@ -115,13 +115,13 @@ discard block |
||
115 | 115 | $client = static::createClient(array(), array( |
116 | 116 | 'PHP_AUTH_USER' => 'admin', |
117 | 117 | 'PHP_AUTH_PW' => 'adminpass', |
118 | - ) ); |
|
118 | + )); |
|
119 | 119 | |
120 | - $client->request( 'POST', '/unittest/jqadm/save/product' ); |
|
120 | + $client->request('POST', '/unittest/jqadm/save/product'); |
|
121 | 121 | $response = $client->getResponse(); |
122 | 122 | |
123 | - $this->assertEquals( 200, $response->getStatusCode() ); |
|
124 | - $this->assertContains( 'item-product', $response->getContent() ); |
|
123 | + $this->assertEquals(200, $response->getStatusCode()); |
|
124 | + $this->assertContains('item-product', $response->getContent()); |
|
125 | 125 | } |
126 | 126 | |
127 | 127 | |
@@ -130,13 +130,13 @@ discard block |
||
130 | 130 | $client = static::createClient(array(), array( |
131 | 131 | 'PHP_AUTH_USER' => 'admin', |
132 | 132 | 'PHP_AUTH_PW' => 'adminpass', |
133 | - ) ); |
|
133 | + )); |
|
134 | 134 | |
135 | - $client->request( 'GET', '/unittest/jqadm/search/product' ); |
|
135 | + $client->request('GET', '/unittest/jqadm/search/product'); |
|
136 | 136 | $response = $client->getResponse(); |
137 | 137 | |
138 | - $this->assertEquals( 200, $response->getStatusCode() ); |
|
139 | - $this->assertContains( 'list-items', $response->getContent() ); |
|
138 | + $this->assertEquals(200, $response->getStatusCode()); |
|
139 | + $this->assertContains('list-items', $response->getContent()); |
|
140 | 140 | } |
141 | 141 | |
142 | 142 | |
@@ -145,11 +145,11 @@ discard block |
||
145 | 145 | $client = static::createClient(array(), array( |
146 | 146 | 'PHP_AUTH_USER' => 'admin', |
147 | 147 | 'PHP_AUTH_PW' => 'adminpass', |
148 | - ) ); |
|
148 | + )); |
|
149 | 149 | |
150 | - $client->request( 'GET', '/invalid/jqadm/search/product' ); |
|
150 | + $client->request('GET', '/invalid/jqadm/search/product'); |
|
151 | 151 | $response = $client->getResponse(); |
152 | 152 | |
153 | - $this->assertEquals( 500, $response->getStatusCode() ); |
|
153 | + $this->assertEquals(500, $response->getStatusCode()); |
|
154 | 154 | } |
155 | 155 | } |
@@ -29,35 +29,35 @@ discard block |
||
29 | 29 | * @param $type File type, i.e. "css" or "js" |
30 | 30 | * @return Response Response object |
31 | 31 | */ |
32 | - public function fileAction( $type ) |
|
32 | + public function fileAction($type) |
|
33 | 33 | { |
34 | 34 | $contents = ''; |
35 | 35 | $files = array(); |
36 | - $aimeos = $this->get( 'aimeos' )->get(); |
|
36 | + $aimeos = $this->get('aimeos')->get(); |
|
37 | 37 | |
38 | - foreach( $aimeos->getCustomPaths( 'admin/jqadm' ) as $base => $paths ) |
|
38 | + foreach ($aimeos->getCustomPaths('admin/jqadm') as $base => $paths) |
|
39 | 39 | { |
40 | - foreach( $paths as $path ) |
|
40 | + foreach ($paths as $path) |
|
41 | 41 | { |
42 | - $jsbAbsPath = $base . '/' . $path; |
|
43 | - $jsb2 = new \Aimeos\MW\Jsb2\Standard( $jsbAbsPath, dirname( $jsbAbsPath ) ); |
|
44 | - $files = array_merge( $files, $jsb2->getFiles( $type ) ); |
|
42 | + $jsbAbsPath = $base.'/'.$path; |
|
43 | + $jsb2 = new \Aimeos\MW\Jsb2\Standard($jsbAbsPath, dirname($jsbAbsPath)); |
|
44 | + $files = array_merge($files, $jsb2->getFiles($type)); |
|
45 | 45 | } |
46 | 46 | } |
47 | 47 | |
48 | - foreach( $files as $file ) |
|
48 | + foreach ($files as $file) |
|
49 | 49 | { |
50 | - if( ( $content = file_get_contents( $file ) ) !== false ) { |
|
50 | + if (($content = file_get_contents($file)) !== false) { |
|
51 | 51 | $contents .= $content; |
52 | 52 | } |
53 | 53 | } |
54 | 54 | |
55 | - $response = new Response( $contents ); |
|
55 | + $response = new Response($contents); |
|
56 | 56 | |
57 | - if( $type === 'js' ) { |
|
58 | - $response->headers->set( 'Content-Type', 'application/javascript' ); |
|
59 | - } elseif( $type === 'css' ) { |
|
60 | - $response->headers->set( 'Content-Type', 'text/css' ); |
|
57 | + if ($type === 'js') { |
|
58 | + $response->headers->set('Content-Type', 'application/javascript'); |
|
59 | + } elseif ($type === 'css') { |
|
60 | + $response->headers->set('Content-Type', 'text/css'); |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | return $response; |
@@ -72,15 +72,15 @@ discard block |
||
72 | 72 | * @param string $site Unique site code |
73 | 73 | * @return Response Generated output |
74 | 74 | */ |
75 | - public function copyAction( Request $request, $resource, $site = 'default' ) |
|
75 | + public function copyAction(Request $request, $resource, $site = 'default') |
|
76 | 76 | { |
77 | - $cntl = $this->createClient( $request, $site, $resource ); |
|
77 | + $cntl = $this->createClient($request, $site, $resource); |
|
78 | 78 | |
79 | - if( ( $html = $cntl->copy() ) == '' ) { |
|
79 | + if (($html = $cntl->copy()) == '') { |
|
80 | 80 | return $cntl->getView()->response(); |
81 | 81 | } |
82 | 82 | |
83 | - return $this->getHtml( $html ); |
|
83 | + return $this->getHtml($html); |
|
84 | 84 | } |
85 | 85 | |
86 | 86 | |
@@ -92,15 +92,15 @@ discard block |
||
92 | 92 | * @param string $site Unique site code |
93 | 93 | * @return Response Generated output |
94 | 94 | */ |
95 | - public function createAction( Request $request, $resource, $site = 'default' ) |
|
95 | + public function createAction(Request $request, $resource, $site = 'default') |
|
96 | 96 | { |
97 | - $cntl = $this->createClient( $request, $site, $resource ); |
|
97 | + $cntl = $this->createClient($request, $site, $resource); |
|
98 | 98 | |
99 | - if( ( $html = $cntl->create() ) == '' ) { |
|
99 | + if (($html = $cntl->create()) == '') { |
|
100 | 100 | return $cntl->getView()->response(); |
101 | 101 | } |
102 | 102 | |
103 | - return $this->getHtml( $html ); |
|
103 | + return $this->getHtml($html); |
|
104 | 104 | } |
105 | 105 | |
106 | 106 | |
@@ -112,15 +112,15 @@ discard block |
||
112 | 112 | * @param string $site Unique site code |
113 | 113 | * @return Response Generated output |
114 | 114 | */ |
115 | - public function deleteAction( Request $request, $resource, $site = 'default' ) |
|
115 | + public function deleteAction(Request $request, $resource, $site = 'default') |
|
116 | 116 | { |
117 | - $cntl = $this->createClient( $request, $site, $resource ); |
|
117 | + $cntl = $this->createClient($request, $site, $resource); |
|
118 | 118 | |
119 | - if( ( $html = $cntl->delete() ) == '' ) { |
|
119 | + if (($html = $cntl->delete()) == '') { |
|
120 | 120 | return $cntl->getView()->response(); |
121 | 121 | } |
122 | 122 | |
123 | - return $this->getHtml( $html ); |
|
123 | + return $this->getHtml($html); |
|
124 | 124 | } |
125 | 125 | |
126 | 126 | |
@@ -132,15 +132,15 @@ discard block |
||
132 | 132 | * @param string $site Unique site code |
133 | 133 | * @return Response Generated output |
134 | 134 | */ |
135 | - public function exportAction( Request $request, $resource, $site = 'default' ) |
|
135 | + public function exportAction(Request $request, $resource, $site = 'default') |
|
136 | 136 | { |
137 | - $cntl = $this->createClient( $request, $site, $resource ); |
|
137 | + $cntl = $this->createClient($request, $site, $resource); |
|
138 | 138 | |
139 | - if( ( $html = $cntl->export() ) == '' ) { |
|
139 | + if (($html = $cntl->export()) == '') { |
|
140 | 140 | return $cntl->getView()->response(); |
141 | 141 | } |
142 | 142 | |
143 | - return $this->getHtml( $html ); |
|
143 | + return $this->getHtml($html); |
|
144 | 144 | } |
145 | 145 | |
146 | 146 | |
@@ -152,15 +152,15 @@ discard block |
||
152 | 152 | * @param string $site Unique site code |
153 | 153 | * @return Response Generated output |
154 | 154 | */ |
155 | - public function getAction( Request $request, $resource, $site = 'default' ) |
|
155 | + public function getAction(Request $request, $resource, $site = 'default') |
|
156 | 156 | { |
157 | - $cntl = $this->createClient( $request, $site, $resource ); |
|
157 | + $cntl = $this->createClient($request, $site, $resource); |
|
158 | 158 | |
159 | - if( ( $html = $cntl->get() ) == '' ) { |
|
159 | + if (($html = $cntl->get()) == '') { |
|
160 | 160 | return $cntl->getView()->response(); |
161 | 161 | } |
162 | 162 | |
163 | - return $this->getHtml( $html ); |
|
163 | + return $this->getHtml($html); |
|
164 | 164 | } |
165 | 165 | |
166 | 166 | |
@@ -172,15 +172,15 @@ discard block |
||
172 | 172 | * @param string $site Unique site code |
173 | 173 | * @return Response Generated output |
174 | 174 | */ |
175 | - public function saveAction( Request $request, $resource, $site = 'default' ) |
|
175 | + public function saveAction(Request $request, $resource, $site = 'default') |
|
176 | 176 | { |
177 | - $cntl = $this->createClient( $request, $site, $resource ); |
|
177 | + $cntl = $this->createClient($request, $site, $resource); |
|
178 | 178 | |
179 | - if( ( $html = $cntl->save() ) == '' ) { |
|
179 | + if (($html = $cntl->save()) == '') { |
|
180 | 180 | return $cntl->getView()->response(); |
181 | 181 | } |
182 | 182 | |
183 | - return $this->getHtml( $html ); |
|
183 | + return $this->getHtml($html); |
|
184 | 184 | } |
185 | 185 | |
186 | 186 | |
@@ -192,15 +192,15 @@ discard block |
||
192 | 192 | * @param string $site Unique site code |
193 | 193 | * @return Response Generated output |
194 | 194 | */ |
195 | - public function searchAction( Request $request, $resource, $site = 'default' ) |
|
195 | + public function searchAction(Request $request, $resource, $site = 'default') |
|
196 | 196 | { |
197 | - $cntl = $this->createClient( $request, $site, $resource ); |
|
197 | + $cntl = $this->createClient($request, $site, $resource); |
|
198 | 198 | |
199 | - if( ( $html = $cntl->search() ) == '' ) { |
|
199 | + if (($html = $cntl->search()) == '') { |
|
200 | 200 | return $cntl->getView()->response(); |
201 | 201 | } |
202 | 202 | |
203 | - return $this->getHtml( $html ); |
|
203 | + return $this->getHtml($html); |
|
204 | 204 | } |
205 | 205 | |
206 | 206 | |
@@ -212,26 +212,26 @@ discard block |
||
212 | 212 | * @param string $resource Resource location, e.g. "product" |
213 | 213 | * @return \Aimeos\Admin\JQAdm\Iface Context item |
214 | 214 | */ |
215 | - protected function createClient( Request $request, $site, $resource ) |
|
215 | + protected function createClient(Request $request, $site, $resource) |
|
216 | 216 | { |
217 | - $lang = $request->get( 'lang', 'en' ); |
|
217 | + $lang = $request->get('lang', 'en'); |
|
218 | 218 | |
219 | - $aimeos = $this->get( 'aimeos' )->get(); |
|
220 | - $templatePaths = $aimeos->getCustomPaths( 'admin/jqadm/templates' ); |
|
219 | + $aimeos = $this->get('aimeos')->get(); |
|
220 | + $templatePaths = $aimeos->getCustomPaths('admin/jqadm/templates'); |
|
221 | 221 | |
222 | - $context = $this->get( 'aimeos_context' )->get( false, 'backend' ); |
|
223 | - $context->setI18n( $this->get( 'aimeos_i18n' )->get( array( $lang, 'en' ) ) ); |
|
224 | - $context->setLocale( $this->get( 'aimeos_locale' )->getBackend( $context, $site ) ); |
|
222 | + $context = $this->get('aimeos_context')->get(false, 'backend'); |
|
223 | + $context->setI18n($this->get('aimeos_i18n')->get(array($lang, 'en'))); |
|
224 | + $context->setLocale($this->get('aimeos_locale')->getBackend($context, $site)); |
|
225 | 225 | |
226 | - $view = $this->get( 'aimeos_view' )->create( $context, $templatePaths, $lang ); |
|
226 | + $view = $this->get('aimeos_view')->create($context, $templatePaths, $lang); |
|
227 | 227 | |
228 | 228 | $view->aimeosType = 'Symfony'; |
229 | - $view->aimeosVersion = $this->get( 'aimeos' )->getVersion(); |
|
230 | - $view->aimeosExtensions = implode( ',', $aimeos->getExtensions() ); |
|
229 | + $view->aimeosVersion = $this->get('aimeos')->getVersion(); |
|
230 | + $view->aimeosExtensions = implode(',', $aimeos->getExtensions()); |
|
231 | 231 | |
232 | - $context->setView( $view ); |
|
232 | + $context->setView($view); |
|
233 | 233 | |
234 | - return \Aimeos\Admin\JQAdm\Factory::createClient( $context, $aimeos, $resource ); |
|
234 | + return \Aimeos\Admin\JQAdm\Factory::createClient($context, $aimeos, $resource); |
|
235 | 235 | } |
236 | 236 | |
237 | 237 | |
@@ -241,8 +241,8 @@ discard block |
||
241 | 241 | * @param string $content Content from admin client |
242 | 242 | * @return Response View for rendering the output |
243 | 243 | */ |
244 | - protected function getHtml( $content ) |
|
244 | + protected function getHtml($content) |
|
245 | 245 | { |
246 | - return $this->render( 'AimeosShopBundle:Jqadm:index.html.twig', array( 'content' => $content ) ); |
|
246 | + return $this->render('AimeosShopBundle:Jqadm:index.html.twig', array('content' => $content)); |
|
247 | 247 | } |
248 | 248 | } |
@@ -28,8 +28,8 @@ discard block |
||
28 | 28 | */ |
29 | 29 | public function indexAction() |
30 | 30 | { |
31 | - $params = $this->get( 'aimeos_page' )->getSections( 'account-index' ); |
|
32 | - return $this->render( 'AimeosShopBundle:Account:index.html.twig', $params )->setPrivate()->setMaxAge( 300 ); |
|
31 | + $params = $this->get('aimeos_page')->getSections('account-index'); |
|
32 | + return $this->render('AimeosShopBundle:Account:index.html.twig', $params)->setPrivate()->setMaxAge(300); |
|
33 | 33 | } |
34 | 34 | |
35 | 35 | |
@@ -43,15 +43,15 @@ discard block |
||
43 | 43 | $context = $this->container->get('aimeos_context')->get(); |
44 | 44 | $langid = $context->getLocale()->getLanguageId(); |
45 | 45 | |
46 | - $view = $this->container->get('aimeos_view')->create( $context, array(), $langid ); |
|
47 | - $context->setView( $view ); |
|
46 | + $view = $this->container->get('aimeos_view')->create($context, array(), $langid); |
|
47 | + $context->setView($view); |
|
48 | 48 | |
49 | - $client = \Aimeos\Client\Html\Factory::createClient( $context, 'account/download' ); |
|
50 | - $client->setView( $view ); |
|
49 | + $client = \Aimeos\Client\Html\Factory::createClient($context, 'account/download'); |
|
50 | + $client->setView($view); |
|
51 | 51 | $client->process(); |
52 | 52 | |
53 | 53 | $response = $view->response(); |
54 | - return Response::create( (string) $response->getBody(), $response->getStatusCode(), $response->getHeaders() ); |
|
54 | + return Response::create((string) $response->getBody(), $response->getStatusCode(), $response->getHeaders()); |
|
55 | 55 | } |
56 | 56 | |
57 | 57 | |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | */ |
63 | 63 | public function favoriteComponentAction() |
64 | 64 | { |
65 | - return $this->getOutput( 'account/favorite' ); |
|
65 | + return $this->getOutput('account/favorite'); |
|
66 | 66 | } |
67 | 67 | |
68 | 68 | |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | */ |
74 | 74 | public function historyComponentAction() |
75 | 75 | { |
76 | - return $this->getOutput( 'account/history' ); |
|
76 | + return $this->getOutput('account/history'); |
|
77 | 77 | } |
78 | 78 | |
79 | 79 | |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | */ |
85 | 85 | public function profileComponentAction() |
86 | 86 | { |
87 | - return $this->getOutput( 'account/profile' ); |
|
87 | + return $this->getOutput('account/profile'); |
|
88 | 88 | } |
89 | 89 | |
90 | 90 | |
@@ -95,6 +95,6 @@ discard block |
||
95 | 95 | */ |
96 | 96 | public function watchComponentAction() |
97 | 97 | { |
98 | - return $this->getOutput( 'account/watch' ); |
|
98 | + return $this->getOutput('account/watch'); |
|
99 | 99 | } |
100 | 100 | } |
@@ -30,9 +30,9 @@ discard block |
||
30 | 30 | * @param string Resource location, e.g. "customer" |
31 | 31 | * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output |
32 | 32 | */ |
33 | - public function deleteAction( ServerRequestInterface $request, $resource ) |
|
33 | + public function deleteAction(ServerRequestInterface $request, $resource) |
|
34 | 34 | { |
35 | - return $this->createClient( $request, $resource )->delete( $request, new Response() ); |
|
35 | + return $this->createClient($request, $resource)->delete($request, new Response()); |
|
36 | 36 | } |
37 | 37 | |
38 | 38 | |
@@ -43,9 +43,9 @@ discard block |
||
43 | 43 | * @param string Resource location, e.g. "customer" |
44 | 44 | * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output |
45 | 45 | */ |
46 | - public function getAction( ServerRequestInterface $request, $resource ) |
|
46 | + public function getAction(ServerRequestInterface $request, $resource) |
|
47 | 47 | { |
48 | - return $this->createClient( $request, $resource )->get( $request, new Response() ); |
|
48 | + return $this->createClient($request, $resource)->get($request, new Response()); |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | |
@@ -56,9 +56,9 @@ discard block |
||
56 | 56 | * @param string Resource location, e.g. "customer" |
57 | 57 | * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output |
58 | 58 | */ |
59 | - public function patchAction( ServerRequestInterface $request, $resource ) |
|
59 | + public function patchAction(ServerRequestInterface $request, $resource) |
|
60 | 60 | { |
61 | - return $this->createClient( $request, $resource )->patch( $request, new Response() ); |
|
61 | + return $this->createClient($request, $resource)->patch($request, new Response()); |
|
62 | 62 | } |
63 | 63 | |
64 | 64 | |
@@ -69,9 +69,9 @@ discard block |
||
69 | 69 | * @param string Resource location, e.g. "customer" |
70 | 70 | * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output |
71 | 71 | */ |
72 | - public function postAction( ServerRequestInterface $request, $resource ) |
|
72 | + public function postAction(ServerRequestInterface $request, $resource) |
|
73 | 73 | { |
74 | - return $this->createClient( $request, $resource )->post( $request, new Response() ); |
|
74 | + return $this->createClient($request, $resource)->post($request, new Response()); |
|
75 | 75 | } |
76 | 76 | |
77 | 77 | |
@@ -82,9 +82,9 @@ discard block |
||
82 | 82 | * @param string Resource location, e.g. "customer" |
83 | 83 | * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output |
84 | 84 | */ |
85 | - public function putAction( ServerRequestInterface $request, $resource ) |
|
85 | + public function putAction(ServerRequestInterface $request, $resource) |
|
86 | 86 | { |
87 | - return $this->createClient( $request, $resource )->put( $request, new Response() ); |
|
87 | + return $this->createClient($request, $resource)->put($request, new Response()); |
|
88 | 88 | } |
89 | 89 | |
90 | 90 | |
@@ -95,9 +95,9 @@ discard block |
||
95 | 95 | * @param string Resource location, e.g. "customer" |
96 | 96 | * @return \Psr\Http\Message\ResponseInterface Response object containing the generated output |
97 | 97 | */ |
98 | - public function optionsAction( ServerRequestInterface $request, $resource = '' ) |
|
98 | + public function optionsAction(ServerRequestInterface $request, $resource = '') |
|
99 | 99 | { |
100 | - return $this->createClient( $request, $resource )->options( $request, new Response() ); |
|
100 | + return $this->createClient($request, $resource)->options($request, new Response()); |
|
101 | 101 | } |
102 | 102 | |
103 | 103 | |
@@ -108,19 +108,19 @@ discard block |
||
108 | 108 | * @param string Resource location, e.g. "customer" |
109 | 109 | * @return \Aimeos\Client\JsonApi\Iface JSON API client |
110 | 110 | */ |
111 | - protected function createClient( ServerRequestInterface $request, $resource ) |
|
111 | + protected function createClient(ServerRequestInterface $request, $resource) |
|
112 | 112 | { |
113 | 113 | $args = $request->getAttributes(); |
114 | 114 | $params = $request->getQueryParams(); |
115 | - $related = ( isset( $args['related'] ) ? $args['related'] : ( isset( $params['related'] ) ? $params['related'] : null ) ); |
|
115 | + $related = (isset($args['related']) ? $args['related'] : (isset($params['related']) ? $params['related'] : null)); |
|
116 | 116 | |
117 | - $tmplPaths = $this->container->get( 'aimeos' )->get()->getCustomPaths( 'client/jsonapi/templates' ); |
|
118 | - $context = $this->container->get( 'aimeos_context' )->get(); |
|
117 | + $tmplPaths = $this->container->get('aimeos')->get()->getCustomPaths('client/jsonapi/templates'); |
|
118 | + $context = $this->container->get('aimeos_context')->get(); |
|
119 | 119 | $langid = $context->getLocale()->getLanguageId(); |
120 | 120 | |
121 | - $view = $this->container->get( 'aimeos_view' )->create( $context, $tmplPaths, $langid ); |
|
122 | - $context->setView( $view ); |
|
121 | + $view = $this->container->get('aimeos_view')->create($context, $tmplPaths, $langid); |
|
122 | + $context->setView($view); |
|
123 | 123 | |
124 | - return \Aimeos\Client\JsonApi\Factory::createClient( $context, $resource . '/' . $related ); |
|
124 | + return \Aimeos\Client\JsonApi\Factory::createClient($context, $resource.'/'.$related); |
|
125 | 125 | } |
126 | 126 | } |