Completed
Push — master ( 04e3fe...ebba58 )
by Aimeos
02:12
created
src/helpers.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -7,7 +7,7 @@  discard block
 block discarded – undo
7 7
  */
8 8
 
9 9
 
10
-if( !function_exists( 'aiconfig' ) )
10
+if (!function_exists('aiconfig'))
11 11
 {
12 12
     /**
13 13
      * Returns the configuration setting for the given key
@@ -16,14 +16,14 @@  discard block
 block discarded – undo
16 16
      * @param mixed $default Default value if the configuration key isn't found
17 17
      * @return mixed Configuration value
18 18
      */
19
-    function aiconfig( $key, $default = null )
19
+    function aiconfig($key, $default = null)
20 20
     {
21
-        return app( '\Aimeos\Shop\Base\Config' )->get()->get( $key, $default );
21
+        return app('\Aimeos\Shop\Base\Config')->get()->get($key, $default);
22 22
     }
23 23
 }
24 24
 
25 25
 
26
-if( !function_exists( 'aitrans' ) )
26
+if (!function_exists('aitrans'))
27 27
 {
28 28
     /**
29 29
      * Translates the given message
@@ -34,16 +34,16 @@  discard block
 block discarded – undo
34 34
      * @param string $locale ISO language code, maybe combine with ISO currency code, e.g. "en_US"
35 35
      * @return string Translated string
36 36
      */
37
-    function aitrans( $singular, array $params = array(), $domain = 'client', $locale = null )
37
+    function aitrans($singular, array $params = array(), $domain = 'client', $locale = null)
38 38
     {
39
-        $i18n = app( '\Aimeos\Shop\Base\Context' )->get()->getI18n( $locale );
39
+        $i18n = app('\Aimeos\Shop\Base\Context')->get()->getI18n($locale);
40 40
 
41
-        return vsprintf( $i18n->dt( $domain, $singular ), $params );
41
+        return vsprintf($i18n->dt($domain, $singular), $params);
42 42
     }
43 43
 }
44 44
 
45 45
 
46
-if( !function_exists( 'aitransplural' ) )
46
+if (!function_exists('aitransplural'))
47 47
 {
48 48
     /**
49 49
      * Translates the given messages based on the number
@@ -56,10 +56,10 @@  discard block
 block discarded – undo
56 56
      * @param string $locale ISO language code, maybe combine with ISO currency code, e.g. "en_US"
57 57
      * @return string Translated string
58 58
      */
59
-    function aitransplural( $singular, $plural, $number, array $params = array(), $domain = 'client', $locale = null )
59
+    function aitransplural($singular, $plural, $number, array $params = array(), $domain = 'client', $locale = null)
60 60
     {
61
-        $i18n = app( '\Aimeos\Shop\Base\Context' )->get()->getI18n( $locale );
61
+        $i18n = app('\Aimeos\Shop\Base\Context')->get()->getI18n($locale);
62 62
 
63
-        return vsprintf( $i18n->dn( $domain, $singular, $plural, $number ), $params );
63
+        return vsprintf($i18n->dn($domain, $singular, $plural, $number), $params);
64 64
     }
65 65
 }
Please login to merge, or discard this patch.
src/Aimeos/Shop/ShopServiceProvider.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -106,12 +106,12 @@
 block discarded – undo
106 106
 		});
107 107
 
108 108
 
109
-		$this->commands( array(
109
+		$this->commands(array(
110 110
 			'Aimeos\Shop\Command\AccountCommand',
111 111
 			'Aimeos\Shop\Command\CacheCommand',
112 112
 			'Aimeos\Shop\Command\SetupCommand',
113 113
 			'Aimeos\Shop\Command\JobsCommand',
114
-		) );
114
+		));
115 115
 	}
116 116
 
117 117
 
Please login to merge, or discard this patch.
src/Aimeos/Shop/Controller/AdminController.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -36,20 +36,20 @@
 block discarded – undo
36 36
 	 * @param \Illuminate\Http\Request $request Laravel request object
37 37
 	 * @return \Illuminate\Contracts\View\View View for rendering the output
38 38
 	 */
39
-	public function indexAction( Request $request )
39
+	public function indexAction(Request $request)
40 40
 	{
41
-		if( config( 'shop.authorize', true ) && ( Auth::check() === false
42
-			|| $request->user()->can( 'admin', [AdminController::class, ['admin', 'editor']] ) ) === false
41
+		if (config('shop.authorize', true) && (Auth::check() === false
42
+			|| $request->user()->can('admin', [AdminController::class, ['admin', 'editor']])) === false
43 43
 		) {
44
-			return View::make( 'shop::admin.index' );
44
+			return View::make('shop::admin.index');
45 45
 		}
46 46
 
47 47
 		$param = array(
48 48
 			'resource' => 'dashboard',
49
-			'site' => Route::input( 'site', Input::get( 'site', 'default' ) ),
50
-			'lang' => Route::input( 'lang', Input::get( 'lang', config( 'app.locale', 'en' ) ) )
49
+			'site' => Route::input('site', Input::get('site', 'default')),
50
+			'lang' => Route::input('lang', Input::get('lang', config('app.locale', 'en')))
51 51
 		);
52 52
 
53
-		return redirect()->route( 'aimeos_shop_jqadm_search', $param );
53
+		return redirect()->route('aimeos_shop_jqadm_search', $param);
54 54
 	}
55 55
 }
Please login to merge, or discard this patch.
src/views/extadm/index.blade.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@  discard block
 block discarded – undo
9 9
         <link type="text/css" rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/extjs/3.4.1-1/resources/css/ext-all.css" />
10 10
         <link type="text/css" rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/extjs/3.4.1-1/resources/css/xtheme-gray.css" />
11 11
 @foreach ($cssFiles as $cssFile)
12
-        <link rel="stylesheet" href="<?= asset('packages/aimeos/shop/' . $cssFile) ?>" />
12
+        <link rel="stylesheet" href="<?= asset('packages/aimeos/shop/'.$cssFile) ?>" />
13 13
 @endforeach
14 14
 
15 15
         <script type="text/javascript">
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
 
46 46
         <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/extjs/3.4.1-1/adapter/ext/ext-base.js"></script>
47 47
         <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/extjs/3.4.1-1/ext-all.js"></script>
48
-        <script type="text/javascript" src="<?= route( 'aimeos_shop_extadm_file', array( 'site' => $site ) ); ?>"></script>
48
+        <script type="text/javascript" src="<?= route('aimeos_shop_extadm_file', array('site' => $site)); ?>"></script>
49 49
 
50 50
     </head>
51 51
     <body>
Please login to merge, or discard this patch.
src/Aimeos/Shop/Controller/BasketController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@
 block discarded – undo
29 29
 	 */
30 30
 	public function indexAction()
31 31
 	{
32
-		$params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'basket-index' );
32
+		$params = app('\Aimeos\Shop\Base\Page')->getSections('basket-index');
33 33
 		return View::make('shop::basket.index', $params);
34 34
 	}
35 35
 }
36 36
\ No newline at end of file
Please login to merge, or discard this patch.
src/Aimeos/Shop/Controller/CatalogController.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
 	 */
31 31
 	public function countAction()
32 32
 	{
33
-		$params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'catalog-count' );
33
+		$params = app('\Aimeos\Shop\Base\Page')->getSections('catalog-count');
34 34
 		$contents = \View::make('shop::catalog.count', $params);
35 35
 
36 36
 		$response = \Response::make($contents, 200);
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
 	 */
48 48
 	public function detailAction()
49 49
 	{
50
-		$params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-detail' );
50
+		$params = app('Aimeos\Shop\Base\Page')->getSections('catalog-detail');
51 51
 		return View::make('shop::catalog.detail', $params);
52 52
 	}
53 53
 
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
 	 */
60 60
 	public function listAction()
61 61
 	{
62
-		$params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-list' );
62
+		$params = app('Aimeos\Shop\Base\Page')->getSections('catalog-list');
63 63
 		return View::make('shop::catalog.list', $params);
64 64
 	}
65 65
 
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
 	 */
72 72
 	public function stockAction()
73 73
 	{
74
-		$params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-stock' );
74
+		$params = app('Aimeos\Shop\Base\Page')->getSections('catalog-stock');
75 75
 		$contents = View::make('shop::catalog.stock', $params);
76 76
 
77 77
 		$response = \Response::make($contents, 200);
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
 	 */
89 89
 	public function suggestAction()
90 90
 	{
91
-		$params = app( 'Aimeos\Shop\Base\Page' )->getSections( 'catalog-suggest' );
91
+		$params = app('Aimeos\Shop\Base\Page')->getSections('catalog-suggest');
92 92
 		$contents = View::make('shop::catalog.suggest', $params);
93 93
 
94 94
 		$response = Response::make($contents, 200);
Please login to merge, or discard this patch.
src/Aimeos/Shop/Controller/CheckoutController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 	 */
30 30
 	public function confirmAction()
31 31
 	{
32
-		$params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'checkout-confirm' );
32
+		$params = app('\Aimeos\Shop\Base\Page')->getSections('checkout-confirm');
33 33
 		return View::make('shop::checkout.confirm', $params);
34 34
 	}
35 35
 
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
 	 */
42 42
 	public function indexAction()
43 43
 	{
44
-		$params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'checkout-index' );
44
+		$params = app('\Aimeos\Shop\Base\Page')->getSections('checkout-index');
45 45
 		return View::make('shop::checkout.index', $params);
46 46
 	}
47 47
 
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 	 */
54 54
 	public function updateAction()
55 55
 	{
56
-		$params = app( '\Aimeos\Shop\Base\Page' )->getSections( 'checkout-update' );
56
+		$params = app('\Aimeos\Shop\Base\Page')->getSections('checkout-update');
57 57
 		return View::make('shop::checkout.update', $params);
58 58
 	}
59 59
 }
60 60
\ No newline at end of file
Please login to merge, or discard this patch.
src/Aimeos/Shop/Base/Page.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -53,9 +53,9 @@  discard block
 block discarded – undo
53 53
 	 * @param \Aimeos\Shop\Base\Locale $locale Locale object
54 54
 	 * @param \Aimeos\Shop\Base\View $view View object
55 55
 	 */
56
-	public function __construct( \Illuminate\Contracts\Config\Repository $config,
56
+	public function __construct(\Illuminate\Contracts\Config\Repository $config,
57 57
 		\Aimeos\Shop\Base\Aimeos $aimeos, \Aimeos\Shop\Base\Context $context,
58
-		\Aimeos\Shop\Base\Locale $locale, \Aimeos\Shop\Base\View $view )
58
+		\Aimeos\Shop\Base\Locale $locale, \Aimeos\Shop\Base\View $view)
59 59
 	{
60 60
 		$this->config = $config;
61 61
 		$this->aimeos = $aimeos;
@@ -71,21 +71,21 @@  discard block
 block discarded – undo
71 71
 	 * @param string $pageName Name of the configured page
72 72
 	 * @return array Associative list with body and header output separated by client name
73 73
 	 */
74
-	public function getSections( $pageName )
74
+	public function getSections($pageName)
75 75
 	{
76 76
 		$context = $this->context->get();
77 77
 		$langid = $context->getLocale()->getLanguageId();
78
-		$tmplPaths = $this->aimeos->get()->getCustomPaths( 'client/html/templates' );
79
-		$view = $this->view->create( $context, $tmplPaths, $langid );
80
-		$context->setView( $view );
78
+		$tmplPaths = $this->aimeos->get()->getCustomPaths('client/html/templates');
79
+		$view = $this->view->create($context, $tmplPaths, $langid);
80
+		$context->setView($view);
81 81
 
82
-		$result = array( 'aibody' => array(), 'aiheader' => array() );
83
-		$page = $context->getConfig()->get( 'page/' . $pageName, array() );
82
+		$result = array('aibody' => array(), 'aiheader' => array());
83
+		$page = $context->getConfig()->get('page/'.$pageName, array());
84 84
 
85
-		foreach( (array) $page as $clientName )
85
+		foreach ((array) $page as $clientName)
86 86
 		{
87
-			$client = \Aimeos\Client\Html\Factory::createClient( $context, $tmplPaths, $clientName );
88
-			$client->setView( clone $view );
87
+			$client = \Aimeos\Client\Html\Factory::createClient($context, $tmplPaths, $clientName);
88
+			$client->setView(clone $view);
89 89
 			$client->process();
90 90
 
91 91
 			$result['aibody'][$clientName] = $client->getBody();
Please login to merge, or discard this patch.
src/Aimeos/Shop/Base/Aimeos.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 	 *
35 35
 	 * @param \Illuminate\Contracts\Config\Repository $config Configuration object
36 36
 	 */
37
-	public function __construct( \Illuminate\Contracts\Config\Repository $config )
37
+	public function __construct(\Illuminate\Contracts\Config\Repository $config)
38 38
 	{
39 39
 		$this->config = $config;
40 40
 	}
@@ -47,16 +47,16 @@  discard block
 block discarded – undo
47 47
 	 */
48 48
 	public function get()
49 49
 	{
50
-		if( $this->object === null )
50
+		if ($this->object === null)
51 51
 		{
52
-			$dir = base_path( 'ext' );
52
+			$dir = base_path('ext');
53 53
 
54
-			if( !is_dir( $dir ) ) {
55
-				$dir = dirname( dirname( dirname( dirname( __DIR__ ) ) ) ) . DIRECTORY_SEPARATOR . 'ext';
54
+			if (!is_dir($dir)) {
55
+				$dir = dirname(dirname(dirname(dirname(__DIR__)))).DIRECTORY_SEPARATOR.'ext';
56 56
 			}
57 57
 
58
-			$extDirs = (array) $this->config->get( 'shop.extdir', $dir );
59
-			$this->object = new \Aimeos\Bootstrap( $extDirs, false );
58
+			$extDirs = (array) $this->config->get('shop.extdir', $dir);
59
+			$this->object = new \Aimeos\Bootstrap($extDirs, false);
60 60
 		}
61 61
 
62 62
 		return $this->object;
@@ -70,12 +70,12 @@  discard block
 block discarded – undo
70 70
 	 */
71 71
 	public function getVersion()
72 72
 	{
73
-		if( ( $content = @file_get_contents( base_path( 'composer.lock' ) ) ) !== false
74
-			&& ( $content = json_decode( $content, true ) ) !== null && isset( $content['packages'] )
73
+		if (($content = @file_get_contents(base_path('composer.lock'))) !== false
74
+			&& ($content = json_decode($content, true)) !== null && isset($content['packages'])
75 75
 		) {
76
-			foreach( (array) $content['packages'] as $item )
76
+			foreach ((array) $content['packages'] as $item)
77 77
 			{
78
-				if( $item['name'] === 'aimeos/aimeos-laravel' ) {
78
+				if ($item['name'] === 'aimeos/aimeos-laravel') {
79 79
 					return $item['version'];
80 80
 				}
81 81
 			}
Please login to merge, or discard this patch.