@@ -11,22 +11,22 @@ |
||
11 | 11 | * Set error reporting to maximum |
12 | 12 | */ |
13 | 13 | error_reporting( -1 ); |
14 | -ini_set( 'display_errors', '1' ); |
|
14 | +ini_set('display_errors', '1'); |
|
15 | 15 | |
16 | -date_default_timezone_set( 'UTC' ); |
|
16 | +date_default_timezone_set('UTC'); |
|
17 | 17 | |
18 | 18 | /** |
19 | 19 | * Set locale settings to reasonable defaults |
20 | 20 | */ |
21 | -setlocale( LC_ALL, 'en_US.UTF-8' ); |
|
22 | -setlocale( LC_NUMERIC, 'POSIX' ); |
|
23 | -setlocale( LC_CTYPE, 'en_US.UTF-8' ); |
|
24 | -setlocale( LC_TIME, 'POSIX' ); |
|
21 | +setlocale(LC_ALL, 'en_US.UTF-8'); |
|
22 | +setlocale(LC_NUMERIC, 'POSIX'); |
|
23 | +setlocale(LC_CTYPE, 'en_US.UTF-8'); |
|
24 | +setlocale(LC_TIME, 'POSIX'); |
|
25 | 25 | |
26 | 26 | /* |
27 | 27 | * Set include path for tests |
28 | 28 | */ |
29 | -define( 'PATH_TESTS', __DIR__ ); |
|
29 | +define('PATH_TESTS', __DIR__); |
|
30 | 30 | |
31 | 31 | require_once 'TestHelperJobs.php'; |
32 | 32 | \TestHelperJobs::bootstrap(); |
@@ -14,8 +14,8 @@ discard block |
||
14 | 14 | $context = \TestHelperJobs::getContext(); |
15 | 15 | $aimeos = \TestHelperJobs::getAimeos(); |
16 | 16 | |
17 | - $obj = \Aimeos\Controller\Jobs\Product\Export\Sitemap\Factory::createController( $context, $aimeos ); |
|
18 | - $this->assertInstanceOf( '\\Aimeos\\Controller\\Jobs\\Iface', $obj); |
|
17 | + $obj = \Aimeos\Controller\Jobs\Product\Export\Sitemap\Factory::createController($context, $aimeos); |
|
18 | + $this->assertInstanceOf('\\Aimeos\\Controller\\Jobs\\Iface', $obj); |
|
19 | 19 | } |
20 | 20 | |
21 | 21 | |
@@ -24,8 +24,8 @@ discard block |
||
24 | 24 | $context = \TestHelperJobs::getContext(); |
25 | 25 | $aimeos = \TestHelperJobs::getAimeos(); |
26 | 26 | |
27 | - $this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' ); |
|
28 | - \Aimeos\Controller\Jobs\Product\Export\Sitemap\Factory::createController( $context, $aimeos, 'Wrong$$$Name' ); |
|
27 | + $this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception'); |
|
28 | + \Aimeos\Controller\Jobs\Product\Export\Sitemap\Factory::createController($context, $aimeos, 'Wrong$$$Name'); |
|
29 | 29 | } |
30 | 30 | |
31 | 31 | |
@@ -34,8 +34,8 @@ discard block |
||
34 | 34 | $context = \TestHelperJobs::getContext(); |
35 | 35 | $aimeos = \TestHelperJobs::getAimeos(); |
36 | 36 | |
37 | - $this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' ); |
|
38 | - \Aimeos\Controller\Jobs\Product\Export\Sitemap\Factory::createController( $context, $aimeos, 'WrongClass' ); |
|
37 | + $this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception'); |
|
38 | + \Aimeos\Controller\Jobs\Product\Export\Sitemap\Factory::createController($context, $aimeos, 'WrongClass'); |
|
39 | 39 | } |
40 | 40 | |
41 | 41 | |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | $context = \TestHelperJobs::getContext(); |
45 | 45 | $aimeos = \TestHelperJobs::getAimeos(); |
46 | 46 | |
47 | - $this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' ); |
|
48 | - \Aimeos\Controller\Jobs\Product\Export\Sitemap\Factory::createController( $context, $aimeos, 'Factory' ); |
|
47 | + $this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception'); |
|
48 | + \Aimeos\Controller\Jobs\Product\Export\Sitemap\Factory::createController($context, $aimeos, 'Factory'); |
|
49 | 49 | } |
50 | 50 | } |
51 | 51 | \ No newline at end of file |
@@ -14,8 +14,8 @@ discard block |
||
14 | 14 | $context = \TestHelperJobs::getContext(); |
15 | 15 | $aimeos = \TestHelperJobs::getAimeos(); |
16 | 16 | |
17 | - $obj = \Aimeos\Controller\Jobs\Product\Export\Factory::createController( $context, $aimeos ); |
|
18 | - $this->assertInstanceOf( '\\Aimeos\\Controller\\Jobs\\Iface', $obj); |
|
17 | + $obj = \Aimeos\Controller\Jobs\Product\Export\Factory::createController($context, $aimeos); |
|
18 | + $this->assertInstanceOf('\\Aimeos\\Controller\\Jobs\\Iface', $obj); |
|
19 | 19 | } |
20 | 20 | |
21 | 21 | |
@@ -24,8 +24,8 @@ discard block |
||
24 | 24 | $context = \TestHelperJobs::getContext(); |
25 | 25 | $aimeos = \TestHelperJobs::getAimeos(); |
26 | 26 | |
27 | - $this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' ); |
|
28 | - \Aimeos\Controller\Jobs\Product\Export\Factory::createController( $context, $aimeos, 'Wrong$$$Name' ); |
|
27 | + $this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception'); |
|
28 | + \Aimeos\Controller\Jobs\Product\Export\Factory::createController($context, $aimeos, 'Wrong$$$Name'); |
|
29 | 29 | } |
30 | 30 | |
31 | 31 | |
@@ -34,8 +34,8 @@ discard block |
||
34 | 34 | $context = \TestHelperJobs::getContext(); |
35 | 35 | $aimeos = \TestHelperJobs::getAimeos(); |
36 | 36 | |
37 | - $this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' ); |
|
38 | - \Aimeos\Controller\Jobs\Product\Export\Factory::createController( $context, $aimeos, 'WrongClass' ); |
|
37 | + $this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception'); |
|
38 | + \Aimeos\Controller\Jobs\Product\Export\Factory::createController($context, $aimeos, 'WrongClass'); |
|
39 | 39 | } |
40 | 40 | |
41 | 41 | |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | $context = \TestHelperJobs::getContext(); |
45 | 45 | $aimeos = \TestHelperJobs::getAimeos(); |
46 | 46 | |
47 | - $this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' ); |
|
48 | - \Aimeos\Controller\Jobs\Product\Export\Factory::createController( $context, $aimeos, 'Factory' ); |
|
47 | + $this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception'); |
|
48 | + \Aimeos\Controller\Jobs\Product\Export\Factory::createController($context, $aimeos, 'Factory'); |
|
49 | 49 | } |
50 | 50 | } |
51 | 51 | \ No newline at end of file |
@@ -14,8 +14,8 @@ discard block |
||
14 | 14 | $context = \TestHelperJobs::getContext(); |
15 | 15 | $aimeos = \TestHelperJobs::getAimeos(); |
16 | 16 | |
17 | - $obj = \Aimeos\Controller\Jobs\Product\Import\Csv\Factory::createController( $context, $aimeos ); |
|
18 | - $this->assertInstanceOf( '\\Aimeos\\Controller\\Jobs\\Iface', $obj); |
|
17 | + $obj = \Aimeos\Controller\Jobs\Product\Import\Csv\Factory::createController($context, $aimeos); |
|
18 | + $this->assertInstanceOf('\\Aimeos\\Controller\\Jobs\\Iface', $obj); |
|
19 | 19 | } |
20 | 20 | |
21 | 21 | |
@@ -24,8 +24,8 @@ discard block |
||
24 | 24 | $context = \TestHelperJobs::getContext(); |
25 | 25 | $aimeos = \TestHelperJobs::getAimeos(); |
26 | 26 | |
27 | - $this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' ); |
|
28 | - \Aimeos\Controller\Jobs\Product\Import\Csv\Factory::createController( $context, $aimeos, 'Wrong$$$Name' ); |
|
27 | + $this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception'); |
|
28 | + \Aimeos\Controller\Jobs\Product\Import\Csv\Factory::createController($context, $aimeos, 'Wrong$$$Name'); |
|
29 | 29 | } |
30 | 30 | |
31 | 31 | |
@@ -34,8 +34,8 @@ discard block |
||
34 | 34 | $context = \TestHelperJobs::getContext(); |
35 | 35 | $aimeos = \TestHelperJobs::getAimeos(); |
36 | 36 | |
37 | - $this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' ); |
|
38 | - \Aimeos\Controller\Jobs\Product\Import\Csv\Factory::createController( $context, $aimeos, 'WrongClass' ); |
|
37 | + $this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception'); |
|
38 | + \Aimeos\Controller\Jobs\Product\Import\Csv\Factory::createController($context, $aimeos, 'WrongClass'); |
|
39 | 39 | } |
40 | 40 | |
41 | 41 | |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | $context = \TestHelperJobs::getContext(); |
45 | 45 | $aimeos = \TestHelperJobs::getAimeos(); |
46 | 46 | |
47 | - $this->setExpectedException( '\\Aimeos\\Controller\\Jobs\\Exception' ); |
|
48 | - \Aimeos\Controller\Jobs\Product\Import\Csv\Factory::createController( $context, $aimeos, 'Factory' ); |
|
47 | + $this->setExpectedException('\\Aimeos\\Controller\\Jobs\\Exception'); |
|
48 | + \Aimeos\Controller\Jobs\Product\Import\Csv\Factory::createController($context, $aimeos, 'Factory'); |
|
49 | 49 | } |
50 | 50 | } |
51 | 51 | \ No newline at end of file |
@@ -15,14 +15,14 @@ discard block |
||
15 | 15 | public static function bootstrap() |
16 | 16 | { |
17 | 17 | self::getAimeos(); |
18 | - \Aimeos\MShop\Factory::setCache( false ); |
|
18 | + \Aimeos\MShop\Factory::setCache(false); |
|
19 | 19 | } |
20 | 20 | |
21 | 21 | |
22 | - public static function getContext( $site = 'unittest' ) |
|
22 | + public static function getContext($site = 'unittest') |
|
23 | 23 | { |
24 | - if( !isset( self::$context[$site] ) ) { |
|
25 | - self::$context[$site] = self::createContext( $site ); |
|
24 | + if (!isset(self::$context[$site])) { |
|
25 | + self::$context[$site] = self::createContext($site); |
|
26 | 26 | } |
27 | 27 | |
28 | 28 | return clone self::$context[$site]; |
@@ -31,13 +31,13 @@ discard block |
||
31 | 31 | |
32 | 32 | public static function getAimeos() |
33 | 33 | { |
34 | - if( !isset( self::$aimeos ) ) |
|
34 | + if (!isset(self::$aimeos)) |
|
35 | 35 | { |
36 | 36 | require_once 'Bootstrap.php'; |
37 | - spl_autoload_register( 'Aimeos\\Bootstrap::autoload' ); |
|
37 | + spl_autoload_register('Aimeos\\Bootstrap::autoload'); |
|
38 | 38 | |
39 | - $extdir = dirname( dirname( dirname( dirname( dirname( __FILE__ ) ) ) ) ); |
|
40 | - self::$aimeos = new \Aimeos\Bootstrap( array( $extdir ), true ); |
|
39 | + $extdir = dirname(dirname(dirname(dirname(dirname(__FILE__))))); |
|
40 | + self::$aimeos = new \Aimeos\Bootstrap(array($extdir), true); |
|
41 | 41 | } |
42 | 42 | |
43 | 43 | return self::$aimeos; |
@@ -46,93 +46,93 @@ discard block |
||
46 | 46 | |
47 | 47 | public static function getControllerPaths() |
48 | 48 | { |
49 | - return self::getAimeos()->getCustomPaths( 'controller/jobs' ); |
|
49 | + return self::getAimeos()->getCustomPaths('controller/jobs'); |
|
50 | 50 | } |
51 | 51 | |
52 | 52 | |
53 | 53 | /** |
54 | 54 | * @param string $site |
55 | 55 | */ |
56 | - private static function createContext( $site ) |
|
56 | + private static function createContext($site) |
|
57 | 57 | { |
58 | 58 | $ctx = new \Aimeos\MShop\Context\Item\Standard(); |
59 | 59 | $aimeos = self::getAimeos(); |
60 | 60 | |
61 | 61 | |
62 | - $paths = $aimeos->getConfigPaths( 'mysql' ); |
|
62 | + $paths = $aimeos->getConfigPaths('mysql'); |
|
63 | 63 | $paths[] = __DIR__ . DIRECTORY_SEPARATOR . 'config'; |
64 | 64 | $file = __DIR__ . DIRECTORY_SEPARATOR . 'confdoc.ser'; |
65 | 65 | |
66 | - $conf = new \Aimeos\MW\Config\PHPArray( array(), $paths ); |
|
67 | - $conf = new \Aimeos\MW\Config\Decorator\Memory( $conf ); |
|
68 | - $conf = new \Aimeos\MW\Config\Decorator\Documentor( $conf, $file ); |
|
69 | - $ctx->setConfig( $conf ); |
|
66 | + $conf = new \Aimeos\MW\Config\PHPArray(array(), $paths); |
|
67 | + $conf = new \Aimeos\MW\Config\Decorator\Memory($conf); |
|
68 | + $conf = new \Aimeos\MW\Config\Decorator\Documentor($conf, $file); |
|
69 | + $ctx->setConfig($conf); |
|
70 | 70 | |
71 | 71 | |
72 | - $logger = new \Aimeos\MW\Logger\File( $site . '.log', \Aimeos\MW\Logger\Base::DEBUG ); |
|
73 | - $ctx->setLogger( $logger ); |
|
72 | + $logger = new \Aimeos\MW\Logger\File($site . '.log', \Aimeos\MW\Logger\Base::DEBUG); |
|
73 | + $ctx->setLogger($logger); |
|
74 | 74 | |
75 | 75 | |
76 | - $dbm = new \Aimeos\MW\DB\Manager\PDO( $conf ); |
|
77 | - $ctx->setDatabaseManager( $dbm ); |
|
76 | + $dbm = new \Aimeos\MW\DB\Manager\PDO($conf); |
|
77 | + $ctx->setDatabaseManager($dbm); |
|
78 | 78 | |
79 | 79 | |
80 | - $fs = new \Aimeos\MW\Filesystem\Manager\Standard( $conf ); |
|
81 | - $ctx->setFilesystemManager( $fs ); |
|
80 | + $fs = new \Aimeos\MW\Filesystem\Manager\Standard($conf); |
|
81 | + $ctx->setFilesystemManager($fs); |
|
82 | 82 | |
83 | 83 | |
84 | - $mq = new \Aimeos\MW\MQueue\Manager\Standard( $conf ); |
|
85 | - $ctx->setMessageQueueManager( $mq ); |
|
84 | + $mq = new \Aimeos\MW\MQueue\Manager\Standard($conf); |
|
85 | + $ctx->setMessageQueueManager($mq); |
|
86 | 86 | |
87 | 87 | |
88 | 88 | $session = new \Aimeos\MW\Session\None(); |
89 | - $ctx->setSession( $session ); |
|
89 | + $ctx->setSession($session); |
|
90 | 90 | |
91 | 91 | |
92 | - $i18n = new \Aimeos\MW\Translation\None( 'de' ); |
|
93 | - $ctx->setI18n( array( 'de' => $i18n ) ); |
|
92 | + $i18n = new \Aimeos\MW\Translation\None('de'); |
|
93 | + $ctx->setI18n(array('de' => $i18n)); |
|
94 | 94 | |
95 | 95 | |
96 | - $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $ctx ); |
|
97 | - $locale = $localeManager->bootstrap( $site, 'de', '', false ); |
|
98 | - $ctx->setLocale( $locale ); |
|
96 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($ctx); |
|
97 | + $locale = $localeManager->bootstrap($site, 'de', '', false); |
|
98 | + $ctx->setLocale($locale); |
|
99 | 99 | |
100 | 100 | |
101 | - $view = self::createView( $conf ); |
|
102 | - $ctx->setView( $view ); |
|
101 | + $view = self::createView($conf); |
|
102 | + $ctx->setView($view); |
|
103 | 103 | |
104 | 104 | |
105 | - $ctx->setEditor( 'core:controller/jobs' ); |
|
105 | + $ctx->setEditor('core:controller/jobs'); |
|
106 | 106 | |
107 | 107 | return $ctx; |
108 | 108 | } |
109 | 109 | |
110 | 110 | |
111 | - protected static function createView( \Aimeos\MW\Config\Iface $config ) |
|
111 | + protected static function createView(\Aimeos\MW\Config\Iface $config) |
|
112 | 112 | { |
113 | 113 | $tmplpaths = array_merge_recursive( |
114 | - self::getAimeos()->getCustomPaths( 'client/html/templates' ), |
|
115 | - self::getAimeos()->getCustomPaths( 'controller/jobs/templates' ) |
|
114 | + self::getAimeos()->getCustomPaths('client/html/templates'), |
|
115 | + self::getAimeos()->getCustomPaths('controller/jobs/templates') |
|
116 | 116 | ); |
117 | 117 | |
118 | - $view = new \Aimeos\MW\View\Standard( $tmplpaths ); |
|
118 | + $view = new \Aimeos\MW\View\Standard($tmplpaths); |
|
119 | 119 | |
120 | - $trans = new \Aimeos\MW\Translation\None( 'de_DE' ); |
|
121 | - $helper = new \Aimeos\MW\View\Helper\Translate\Standard( $view, $trans ); |
|
122 | - $view->addHelper( 'translate', $helper ); |
|
120 | + $trans = new \Aimeos\MW\Translation\None('de_DE'); |
|
121 | + $helper = new \Aimeos\MW\View\Helper\Translate\Standard($view, $trans); |
|
122 | + $view->addHelper('translate', $helper); |
|
123 | 123 | |
124 | - $helper = new \Aimeos\MW\View\Helper\Url\Standard( $view, 'http://baseurl' ); |
|
125 | - $view->addHelper( 'url', $helper ); |
|
124 | + $helper = new \Aimeos\MW\View\Helper\Url\Standard($view, 'http://baseurl'); |
|
125 | + $view->addHelper('url', $helper); |
|
126 | 126 | |
127 | - $helper = new \Aimeos\MW\View\Helper\Number\Standard( $view, '.', '' ); |
|
128 | - $view->addHelper( 'number', $helper ); |
|
127 | + $helper = new \Aimeos\MW\View\Helper\Number\Standard($view, '.', ''); |
|
128 | + $view->addHelper('number', $helper); |
|
129 | 129 | |
130 | - $helper = new \Aimeos\MW\View\Helper\Date\Standard( $view, 'Y-m-d' ); |
|
131 | - $view->addHelper( 'date', $helper ); |
|
130 | + $helper = new \Aimeos\MW\View\Helper\Date\Standard($view, 'Y-m-d'); |
|
131 | + $view->addHelper('date', $helper); |
|
132 | 132 | |
133 | - $config = new \Aimeos\MW\Config\Decorator\Protect( $config, array( 'controller/jobs', 'client/html' ) ); |
|
134 | - $helper = new \Aimeos\MW\View\Helper\Config\Standard( $view, $config ); |
|
135 | - $view->addHelper( 'config', $helper ); |
|
133 | + $config = new \Aimeos\MW\Config\Decorator\Protect($config, array('controller/jobs', 'client/html')); |
|
134 | + $helper = new \Aimeos\MW\View\Helper\Config\Standard($view, $config); |
|
135 | + $view->addHelper('config', $helper); |
|
136 | 136 | |
137 | 137 | return $view; |
138 | 138 | } |
@@ -14,49 +14,49 @@ |
||
14 | 14 | |
15 | 15 | protected function setUp() |
16 | 16 | { |
17 | - \Aimeos\MShop\Factory::setCache( true ); |
|
17 | + \Aimeos\MShop\Factory::setCache(true); |
|
18 | 18 | |
19 | 19 | $context = \TestHelperCntl::getContext(); |
20 | - $this->object = new \Aimeos\Controller\Common\Product\Import\Csv\Cache\Attribute\Standard( $context ); |
|
20 | + $this->object = new \Aimeos\Controller\Common\Product\Import\Csv\Cache\Attribute\Standard($context); |
|
21 | 21 | } |
22 | 22 | |
23 | 23 | |
24 | 24 | protected function tearDown() |
25 | 25 | { |
26 | - \Aimeos\MShop\Factory::setCache( false ); |
|
26 | + \Aimeos\MShop\Factory::setCache(false); |
|
27 | 27 | \Aimeos\MShop\Factory::clear(); |
28 | 28 | } |
29 | 29 | |
30 | 30 | |
31 | 31 | public function testGet() |
32 | 32 | { |
33 | - $item = $this->object->get( 'black', 'color' ); |
|
33 | + $item = $this->object->get('black', 'color'); |
|
34 | 34 | |
35 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Attribute\\Item\\Iface', $item ); |
|
36 | - $this->assertEquals( 'black', $item->getCode() ); |
|
37 | - $this->assertEquals( 'color', $item->getType() ); |
|
35 | + $this->assertInstanceOf('\\Aimeos\\MShop\\Attribute\\Item\\Iface', $item); |
|
36 | + $this->assertEquals('black', $item->getCode()); |
|
37 | + $this->assertEquals('color', $item->getType()); |
|
38 | 38 | } |
39 | 39 | |
40 | 40 | |
41 | 41 | public function testGetUnknown() |
42 | 42 | { |
43 | - $this->assertEquals( null, $this->object->get( 'cache-test', 'color' ) ); |
|
43 | + $this->assertEquals(null, $this->object->get('cache-test', 'color')); |
|
44 | 44 | } |
45 | 45 | |
46 | 46 | |
47 | 47 | public function testSet() |
48 | 48 | { |
49 | - $item = $this->object->get( 'black', 'color' ); |
|
49 | + $item = $this->object->get('black', 'color'); |
|
50 | 50 | |
51 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Attribute\\Item\\Iface', $item ); |
|
51 | + $this->assertInstanceOf('\\Aimeos\\MShop\\Attribute\\Item\\Iface', $item); |
|
52 | 52 | |
53 | - $item->setCode( 'cache-test' ); |
|
53 | + $item->setCode('cache-test'); |
|
54 | 54 | |
55 | - $this->object->set( $item ); |
|
56 | - $item = $this->object->get( 'cache-test', 'color' ); |
|
55 | + $this->object->set($item); |
|
56 | + $item = $this->object->get('cache-test', 'color'); |
|
57 | 57 | |
58 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Attribute\\Item\\Iface', $item ); |
|
59 | - $this->assertEquals( 'cache-test', $item->getCode() ); |
|
60 | - $this->assertEquals( 'color', $item->getType() ); |
|
58 | + $this->assertInstanceOf('\\Aimeos\\MShop\\Attribute\\Item\\Iface', $item); |
|
59 | + $this->assertEquals('cache-test', $item->getCode()); |
|
60 | + $this->assertEquals('color', $item->getType()); |
|
61 | 61 | } |
62 | 62 | } |
63 | 63 | \ No newline at end of file |
@@ -42,10 +42,10 @@ discard block |
||
42 | 42 | * @param array $mapping Associative list of field position in CSV as key and domain item key as value |
43 | 43 | * @param \Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object Decorated processor |
44 | 44 | */ |
45 | - public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping, |
|
46 | - \Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object = null ) |
|
45 | + public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping, |
|
46 | + \Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object = null) |
|
47 | 47 | { |
48 | - parent::__construct( $context, $mapping, $object ); |
|
48 | + parent::__construct($context, $mapping, $object); |
|
49 | 49 | |
50 | 50 | /** controller/common/product/import/csv/processor/media/listtypes |
51 | 51 | * Names of the product list types for media that are updated or removed |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | * @see controller/common/product/import/csv/processor/price/listtypes |
67 | 67 | * @see controller/common/product/import/csv/processor/text/listtypes |
68 | 68 | */ |
69 | - $this->listTypes = $context->getConfig()->get( 'controller/common/product/import/csv/processor/media/listtypes' ); |
|
69 | + $this->listTypes = $context->getConfig()->get('controller/common/product/import/csv/processor/media/listtypes'); |
|
70 | 70 | } |
71 | 71 | |
72 | 72 | |
@@ -77,72 +77,72 @@ discard block |
||
77 | 77 | * @param array $data List of CSV fields with position as key and data as value |
78 | 78 | * @return array List of data which hasn't been imported |
79 | 79 | */ |
80 | - public function process( \Aimeos\MShop\Product\Item\Iface $product, array $data ) |
|
80 | + public function process(\Aimeos\MShop\Product\Item\Iface $product, array $data) |
|
81 | 81 | { |
82 | 82 | $context = $this->getContext(); |
83 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'media' ); |
|
84 | - $listManager = \Aimeos\MShop\Factory::createManager( $context, 'product/lists' ); |
|
85 | - $separator = $context->getConfig()->get( 'controller/common/product/import/csv/separator', "\n" ); |
|
83 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'media'); |
|
84 | + $listManager = \Aimeos\MShop\Factory::createManager($context, 'product/lists'); |
|
85 | + $separator = $context->getConfig()->get('controller/common/product/import/csv/separator', "\n"); |
|
86 | 86 | |
87 | 87 | $manager->begin(); |
88 | 88 | |
89 | 89 | try |
90 | 90 | { |
91 | - $map = $this->getMappedChunk( $data ); |
|
92 | - $listItems = $product->getListItems( 'media' ); |
|
91 | + $map = $this->getMappedChunk($data); |
|
92 | + $listItems = $product->getListItems('media'); |
|
93 | 93 | |
94 | - foreach( $map as $pos => $list ) |
|
94 | + foreach ($map as $pos => $list) |
|
95 | 95 | { |
96 | - if( $this->checkEntry( $list ) === false ) { |
|
96 | + if ($this->checkEntry($list) === false) { |
|
97 | 97 | continue; |
98 | 98 | } |
99 | 99 | |
100 | - $urls = explode( $separator, $list['media.url'] ); |
|
101 | - $type = $this->getValue( $list, 'media.type', 'default' ); |
|
102 | - $typecode = $this->getValue( $list, 'product.lists.type', 'default' ); |
|
100 | + $urls = explode($separator, $list['media.url']); |
|
101 | + $type = $this->getValue($list, 'media.type', 'default'); |
|
102 | + $typecode = $this->getValue($list, 'product.lists.type', 'default'); |
|
103 | 103 | |
104 | - if( ( $langid = $this->getValue( $list, 'media.languageid', null ) ) === '' ) { |
|
104 | + if (($langid = $this->getValue($list, 'media.languageid', null)) === '') { |
|
105 | 105 | $langid = null; |
106 | 106 | } |
107 | 107 | |
108 | - foreach( $urls as $url ) |
|
108 | + foreach ($urls as $url) |
|
109 | 109 | { |
110 | - if( ( $listItem = array_shift( $listItems ) ) !== null ) { |
|
110 | + if (($listItem = array_shift($listItems)) !== null) { |
|
111 | 111 | $refItem = $listItem->getRefItem(); |
112 | 112 | } else { |
113 | 113 | $listItem = $listManager->createItem(); |
114 | 114 | $refItem = $manager->createItem(); |
115 | 115 | } |
116 | 116 | |
117 | - $list['media.typeid'] = $this->getTypeId( 'media/type', 'product', $type ); |
|
117 | + $list['media.typeid'] = $this->getTypeId('media/type', 'product', $type); |
|
118 | 118 | $list['media.languageid'] = $langid; |
119 | 119 | $list['media.domain'] = 'product'; |
120 | 120 | $list['media.url'] = $url; |
121 | 121 | |
122 | - $refItem->fromArray( $this->addItemDefaults( $list ) ); |
|
123 | - $manager->saveItem( $refItem ); |
|
122 | + $refItem->fromArray($this->addItemDefaults($list)); |
|
123 | + $manager->saveItem($refItem); |
|
124 | 124 | |
125 | - $list['product.lists.typeid'] = $this->getTypeId( 'product/lists/type', 'media', $typecode ); |
|
125 | + $list['product.lists.typeid'] = $this->getTypeId('product/lists/type', 'media', $typecode); |
|
126 | 126 | $list['product.lists.parentid'] = $product->getId(); |
127 | 127 | $list['product.lists.refid'] = $refItem->getId(); |
128 | 128 | $list['product.lists.domain'] = 'media'; |
129 | 129 | |
130 | - $listItem->fromArray( $this->addListItemDefaults( $list, $pos++ ) ); |
|
131 | - $listManager->saveItem( $listItem ); |
|
130 | + $listItem->fromArray($this->addListItemDefaults($list, $pos++)); |
|
131 | + $listManager->saveItem($listItem); |
|
132 | 132 | } |
133 | 133 | } |
134 | 134 | |
135 | - foreach( $listItems as $listItem ) |
|
135 | + foreach ($listItems as $listItem) |
|
136 | 136 | { |
137 | - $manager->deleteItem( $listItem->getRefItem()->getId() ); |
|
138 | - $listManager->deleteItem( $listItem->getId() ); |
|
137 | + $manager->deleteItem($listItem->getRefItem()->getId()); |
|
138 | + $listManager->deleteItem($listItem->getId()); |
|
139 | 139 | } |
140 | 140 | |
141 | - $remaining = $this->getObject()->process( $product, $data ); |
|
141 | + $remaining = $this->getObject()->process($product, $data); |
|
142 | 142 | |
143 | 143 | $manager->commit(); |
144 | 144 | } |
145 | - catch( \Exception $e ) |
|
145 | + catch (\Exception $e) |
|
146 | 146 | { |
147 | 147 | $manager->rollback(); |
148 | 148 | throw $e; |
@@ -158,17 +158,17 @@ discard block |
||
158 | 158 | * @param array $list Associative list of domain item keys and their values, e.g. "media.status" => 1 |
159 | 159 | * @return array Given associative list enriched by default values if they were not already set |
160 | 160 | */ |
161 | - protected function addItemDefaults( array $list ) |
|
161 | + protected function addItemDefaults(array $list) |
|
162 | 162 | { |
163 | - if( !isset( $list['media.label'] ) ) { |
|
163 | + if (!isset($list['media.label'])) { |
|
164 | 164 | $list['media.label'] = $list['media.url']; |
165 | 165 | } |
166 | 166 | |
167 | - if( !isset( $list['media.preview'] ) ) { |
|
167 | + if (!isset($list['media.preview'])) { |
|
168 | 168 | $list['media.preview'] = $list['media.url']; |
169 | 169 | } |
170 | 170 | |
171 | - if( !isset( $list['media.status'] ) ) { |
|
171 | + if (!isset($list['media.status'])) { |
|
172 | 172 | $list['media.status'] = 1; |
173 | 173 | } |
174 | 174 | |
@@ -182,10 +182,10 @@ discard block |
||
182 | 182 | * @param array $list Associative list of key/value pairs from the mapping |
183 | 183 | * @return boolean True if valid, false if not |
184 | 184 | */ |
185 | - protected function checkEntry( array $list ) |
|
185 | + protected function checkEntry(array $list) |
|
186 | 186 | { |
187 | - if( !isset( $list['media.url'] ) || $list['media.url'] === '' || isset( $list['product.lists.type'] ) |
|
188 | - && $this->listTypes !== null && !in_array( $list['product.lists.type'], (array) $this->listTypes ) |
|
187 | + if (!isset($list['media.url']) || $list['media.url'] === '' || isset($list['product.lists.type']) |
|
188 | + && $this->listTypes !== null && !in_array($list['product.lists.type'], (array) $this->listTypes) |
|
189 | 189 | ) { |
190 | 190 | return false; |
191 | 191 | } |
@@ -32,8 +32,8 @@ discard block |
||
32 | 32 | * @param array $mapping Associative list of field position in CSV as key and domain item key as value |
33 | 33 | * @param \Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object Decorated processor |
34 | 34 | */ |
35 | - public function __construct( \Aimeos\MShop\Context\Item\Iface $context, array $mapping, |
|
36 | - \Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object = null ) |
|
35 | + public function __construct(\Aimeos\MShop\Context\Item\Iface $context, array $mapping, |
|
36 | + \Aimeos\Controller\Common\Product\Import\Csv\Processor\Iface $object = null) |
|
37 | 37 | { |
38 | 38 | $this->context = $context; |
39 | 39 | $this->mapping = $mapping; |
@@ -48,13 +48,13 @@ discard block |
||
48 | 48 | * @param integer $pos Computed position of the list item in the associated list of items |
49 | 49 | * @return array Given associative list enriched by default values if they were not already set |
50 | 50 | */ |
51 | - protected function addListItemDefaults( array $list, $pos ) |
|
51 | + protected function addListItemDefaults(array $list, $pos) |
|
52 | 52 | { |
53 | - if( !isset( $list['product.lists.position'] ) ) { |
|
53 | + if (!isset($list['product.lists.position'])) { |
|
54 | 54 | $list['product.lists.position'] = $pos; |
55 | 55 | } |
56 | 56 | |
57 | - if( !isset( $list['product.lists.status'] ) ) { |
|
57 | + if (!isset($list['product.lists.status'])) { |
|
58 | 58 | $list['product.lists.status'] = 1; |
59 | 59 | } |
60 | 60 | |
@@ -92,8 +92,8 @@ discard block |
||
92 | 92 | */ |
93 | 93 | protected function getObject() |
94 | 94 | { |
95 | - if( $this->object === null ) { |
|
96 | - throw new \Aimeos\Controller\Jobs\Exception( 'No processor object available' ); |
|
95 | + if ($this->object === null) { |
|
96 | + throw new \Aimeos\Controller\Jobs\Exception('No processor object available'); |
|
97 | 97 | } |
98 | 98 | |
99 | 99 | return $this->object; |
@@ -106,21 +106,21 @@ discard block |
||
106 | 106 | * @param array $data List of CSV fields with position as key and domain item key as value |
107 | 107 | * @return array List of associative arrays containing the chunked properties |
108 | 108 | */ |
109 | - protected function getMappedChunk( array &$data ) |
|
109 | + protected function getMappedChunk(array &$data) |
|
110 | 110 | { |
111 | 111 | $idx = 0; |
112 | 112 | $map = array(); |
113 | 113 | |
114 | - foreach( $this->getMapping() as $pos => $key ) |
|
114 | + foreach ($this->getMapping() as $pos => $key) |
|
115 | 115 | { |
116 | - if( isset( $map[$idx][$key] ) ) { |
|
116 | + if (isset($map[$idx][$key])) { |
|
117 | 117 | $idx++; |
118 | 118 | } |
119 | 119 | |
120 | - if( isset( $data[$pos] ) ) |
|
120 | + if (isset($data[$pos])) |
|
121 | 121 | { |
122 | 122 | $map[$idx][$key] = $data[$pos]; |
123 | - unset( $data[$pos] ); |
|
123 | + unset($data[$pos]); |
|
124 | 124 | } |
125 | 125 | } |
126 | 126 | |
@@ -136,8 +136,8 @@ discard block |
||
136 | 136 | * @param mixed $default Default value if key isn't found |
137 | 137 | * @param mixed Value for the key in the list of the default value |
138 | 138 | */ |
139 | - protected function getValue( array $list, $key, $default ) |
|
139 | + protected function getValue(array $list, $key, $default) |
|
140 | 140 | { |
141 | - return ( isset( $list[$key] ) ? $list[$key] : $default ); |
|
141 | + return (isset($list[$key]) ? $list[$key] : $default); |
|
142 | 142 | } |
143 | 143 | } |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | */ |
30 | 30 | public function getName() |
31 | 31 | { |
32 | - return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Capture authorized payments' ); |
|
32 | + return $this->getContext()->getI18n()->dt('controller/jobs', 'Capture authorized payments'); |
|
33 | 33 | } |
34 | 34 | |
35 | 35 | |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | */ |
41 | 41 | public function getDescription() |
42 | 42 | { |
43 | - return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Authorized payments of orders will be captured after dispatching or after a configurable amount of time' ); |
|
43 | + return $this->getContext()->getI18n()->dt('controller/jobs', 'Authorized payments of orders will be captured after dispatching or after a configurable amount of time'); |
|
44 | 44 | } |
45 | 45 | |
46 | 46 | |
@@ -68,8 +68,8 @@ discard block |
||
68 | 68 | * @category User |
69 | 69 | * @category Developer |
70 | 70 | */ |
71 | - $days = $config->get( 'controller/jobs/order/service/payment/limit-days', 90 ); |
|
72 | - $date = date( 'Y-m-d 00:00:00', time() - 86400 * $days ); |
|
71 | + $days = $config->get('controller/jobs/order/service/payment/limit-days', 90); |
|
72 | + $date = date('Y-m-d 00:00:00', time() - 86400 * $days); |
|
73 | 73 | |
74 | 74 | /** controller/jobs/order/service/payment/capture-days |
75 | 75 | * Automatically capture payments after the configured amount of days |
@@ -84,90 +84,90 @@ discard block |
||
84 | 84 | * @category User |
85 | 85 | * @category Developer |
86 | 86 | */ |
87 | - $capDays = $config->get( 'controller/jobs/order/service/payment/capture-days', null ); |
|
87 | + $capDays = $config->get('controller/jobs/order/service/payment/capture-days', null); |
|
88 | 88 | |
89 | 89 | |
90 | - $serviceManager = \Aimeos\MShop\Factory::createManager( $context, 'service' ); |
|
90 | + $serviceManager = \Aimeos\MShop\Factory::createManager($context, 'service'); |
|
91 | 91 | $serviceSearch = $serviceManager->createSearch(); |
92 | - $serviceSearch->setConditions( $serviceSearch->compare( '==', 'service.type.code', 'payment' ) ); |
|
92 | + $serviceSearch->setConditions($serviceSearch->compare('==', 'service.type.code', 'payment')); |
|
93 | 93 | |
94 | - $orderManager = \Aimeos\MShop\Factory::createManager( $context, 'order' ); |
|
94 | + $orderManager = \Aimeos\MShop\Factory::createManager($context, 'order'); |
|
95 | 95 | $orderSearch = $orderManager->createSearch(); |
96 | 96 | |
97 | - $status = array( \Aimeos\MShop\Order\Item\Base::STAT_DISPATCHED, \Aimeos\MShop\Order\Item\Base::STAT_DELIVERED ); |
|
97 | + $status = array(\Aimeos\MShop\Order\Item\Base::STAT_DISPATCHED, \Aimeos\MShop\Order\Item\Base::STAT_DELIVERED); |
|
98 | 98 | $start = 0; |
99 | 99 | |
100 | 100 | do |
101 | 101 | { |
102 | - $serviceItems = $serviceManager->searchItems( $serviceSearch ); |
|
102 | + $serviceItems = $serviceManager->searchItems($serviceSearch); |
|
103 | 103 | |
104 | - foreach( $serviceItems as $serviceItem ) |
|
104 | + foreach ($serviceItems as $serviceItem) |
|
105 | 105 | { |
106 | 106 | try |
107 | 107 | { |
108 | - $serviceProvider = $serviceManager->getProvider( $serviceItem ); |
|
108 | + $serviceProvider = $serviceManager->getProvider($serviceItem); |
|
109 | 109 | |
110 | - if( !$serviceProvider->isImplemented( \Aimeos\MShop\Service\Provider\Payment\Base::FEAT_CAPTURE ) ) { |
|
110 | + if (!$serviceProvider->isImplemented(\Aimeos\MShop\Service\Provider\Payment\Base::FEAT_CAPTURE)) { |
|
111 | 111 | continue; |
112 | 112 | } |
113 | 113 | |
114 | 114 | |
115 | 115 | $expr = array(); |
116 | - $expr[] = $orderSearch->compare( '>', 'order.datepayment', $date ); |
|
116 | + $expr[] = $orderSearch->compare('>', 'order.datepayment', $date); |
|
117 | 117 | |
118 | - if( $capDays !== null ) |
|
118 | + if ($capDays !== null) |
|
119 | 119 | { |
120 | - $capdate = date( 'Y-m-d 00:00:00', time() - 86400 * $capDays ); |
|
121 | - $expr[] = $orderSearch->compare( '<=', 'order.datepayment', $capdate ); |
|
120 | + $capdate = date('Y-m-d 00:00:00', time() - 86400 * $capDays); |
|
121 | + $expr[] = $orderSearch->compare('<=', 'order.datepayment', $capdate); |
|
122 | 122 | } |
123 | 123 | else |
124 | 124 | { |
125 | - $expr[] = $orderSearch->compare( '==', 'order.statusdelivery', $status ); |
|
125 | + $expr[] = $orderSearch->compare('==', 'order.statusdelivery', $status); |
|
126 | 126 | } |
127 | 127 | |
128 | - $expr[] = $orderSearch->compare( '==', 'order.statuspayment', \Aimeos\MShop\Order\Item\Base::PAY_AUTHORIZED ); |
|
129 | - $expr[] = $orderSearch->compare( '==', 'order.base.service.code', $serviceItem->getCode() ); |
|
130 | - $expr[] = $orderSearch->compare( '==', 'order.base.service.type', 'payment' ); |
|
128 | + $expr[] = $orderSearch->compare('==', 'order.statuspayment', \Aimeos\MShop\Order\Item\Base::PAY_AUTHORIZED); |
|
129 | + $expr[] = $orderSearch->compare('==', 'order.base.service.code', $serviceItem->getCode()); |
|
130 | + $expr[] = $orderSearch->compare('==', 'order.base.service.type', 'payment'); |
|
131 | 131 | |
132 | - $orderSearch->setConditions( $orderSearch->combine( '&&', $expr ) ); |
|
132 | + $orderSearch->setConditions($orderSearch->combine('&&', $expr)); |
|
133 | 133 | |
134 | 134 | |
135 | 135 | $orderStart = 0; |
136 | 136 | |
137 | 137 | do |
138 | 138 | { |
139 | - $orderItems = $orderManager->searchItems( $orderSearch ); |
|
139 | + $orderItems = $orderManager->searchItems($orderSearch); |
|
140 | 140 | |
141 | - foreach( $orderItems as $orderItem ) |
|
141 | + foreach ($orderItems as $orderItem) |
|
142 | 142 | { |
143 | 143 | try |
144 | 144 | { |
145 | - $serviceProvider->capture( $orderItem ); |
|
145 | + $serviceProvider->capture($orderItem); |
|
146 | 146 | } |
147 | - catch( \Exception $e ) |
|
147 | + catch (\Exception $e) |
|
148 | 148 | { |
149 | 149 | $str = 'Error while capturing payment for order with ID "%1$s": %2$s'; |
150 | - $context->getLogger()->log( sprintf( $str, $orderItem->getId(), $e->getMessage() ) ); |
|
150 | + $context->getLogger()->log(sprintf($str, $orderItem->getId(), $e->getMessage())); |
|
151 | 151 | } |
152 | 152 | } |
153 | 153 | |
154 | - $orderCount = count( $orderItems ); |
|
154 | + $orderCount = count($orderItems); |
|
155 | 155 | $orderStart += $orderCount; |
156 | - $orderSearch->setSlice( $orderStart ); |
|
156 | + $orderSearch->setSlice($orderStart); |
|
157 | 157 | } |
158 | - while( $orderCount >= $orderSearch->getSliceSize() ); |
|
158 | + while ($orderCount >= $orderSearch->getSliceSize()); |
|
159 | 159 | } |
160 | - catch( \Exception $e ) |
|
160 | + catch (\Exception $e) |
|
161 | 161 | { |
162 | 162 | $str = 'Error while capturing payments for service with ID "%1$s": %2$s'; |
163 | - $context->getLogger()->log( sprintf( $str, $serviceItem->getId(), $e->getMessage() ) ); |
|
163 | + $context->getLogger()->log(sprintf($str, $serviceItem->getId(), $e->getMessage())); |
|
164 | 164 | } |
165 | 165 | } |
166 | 166 | |
167 | - $count = count( $serviceItems ); |
|
167 | + $count = count($serviceItems); |
|
168 | 168 | $start += $count; |
169 | - $serviceSearch->setSlice( $start ); |
|
169 | + $serviceSearch->setSlice($start); |
|
170 | 170 | } |
171 | - while( $count >= $serviceSearch->getSliceSize() ); |
|
171 | + while ($count >= $serviceSearch->getSliceSize()); |
|
172 | 172 | } |
173 | 173 | } |