Completed
Push — master ( c6784a...d17e8a )
by Aimeos
05:49
created
lib/custom/tests/bootstrap.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -4,17 +4,17 @@
 block discarded – undo
4 4
  * Set error reporting to maximum
5 5
  */
6 6
 error_reporting( -1 );
7
-ini_set( 'display_errors', true );
7
+ini_set('display_errors', true);
8 8
 
9
-date_default_timezone_set( 'UTC' );
9
+date_default_timezone_set('UTC');
10 10
 
11 11
 /*
12 12
  * Set locale settings to reasonable defaults
13 13
  */
14
-setlocale( LC_ALL, 'en_US.UTF-8' );
15
-setlocale( LC_CTYPE, 'en_US.UTF-8' );
16
-setlocale( LC_NUMERIC, 'POSIX' );
17
-setlocale( LC_TIME, 'POSIX' );
14
+setlocale(LC_ALL, 'en_US.UTF-8');
15
+setlocale(LC_CTYPE, 'en_US.UTF-8');
16
+setlocale(LC_NUMERIC, 'POSIX');
17
+setlocale(LC_TIME, 'POSIX');
18 18
 
19 19
 
20 20
 require_once 'TestHelper.php';
Please login to merge, or discard this patch.
lib/custom/setup/FosuserAddIndexes.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 	 */
45 45
 	public function getPostDependencies()
46 46
 	{
47
-		return array( 'TablesCreateFosUser' );
47
+		return array('TablesCreateFosUser');
48 48
 	}
49 49
 
50 50
 
@@ -53,23 +53,23 @@  discard block
 block discarded – undo
53 53
 	 */
54 54
 	public function migrate()
55 55
 	{
56
-		$this->msg( 'Adding indexes from "fos_user"', 0 ); $this->status( '' );
56
+		$this->msg('Adding indexes from "fos_user"', 0); $this->status('');
57 57
 
58
-		$schema = $this->getSchema( 'db-customer' );
58
+		$schema = $this->getSchema('db-customer');
59 59
 
60
-		foreach( $this->list as $idx => $stmt )
60
+		foreach ($this->list as $idx => $stmt)
61 61
 		{
62
-			$this->msg( sprintf( 'Checking index "%1$s"', $idx ), 0 );
62
+			$this->msg(sprintf('Checking index "%1$s"', $idx), 0);
63 63
 
64
-			if( $schema->tableExists( 'fos_user' ) === true
65
-				&& $schema->indexExists( 'fos_user', $idx ) === false )
64
+			if ($schema->tableExists('fos_user') === true
65
+				&& $schema->indexExists('fos_user', $idx) === false)
66 66
 			{
67
-				$this->execute( $stmt );
68
-				$this->status( 'done' );
67
+				$this->execute($stmt);
68
+				$this->status('done');
69 69
 			}
70 70
 			else
71 71
 			{
72
-				$this->status( 'OK' );
72
+				$this->status('OK');
73 73
 			}
74 74
 		}
75 75
 	}
Please login to merge, or discard this patch.
lib/custom/tests/TestHelper.php 1 patch
Spacing   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -18,14 +18,14 @@  discard block
 block discarded – undo
18 18
 
19 19
 		$includepaths = $aimeos->getIncludePaths();
20 20
 		$includepaths[] = get_include_path();
21
-		set_include_path( implode( PATH_SEPARATOR, $includepaths ) );
21
+		set_include_path(implode(PATH_SEPARATOR, $includepaths));
22 22
 	}
23 23
 
24 24
 
25
-	public static function getContext( $site = 'unittest' )
25
+	public static function getContext($site = 'unittest')
26 26
 	{
27
-		if( !isset( self::$context[$site] ) ) {
28
-			self::$context[$site] = self::createContext( $site );
27
+		if (!isset(self::$context[$site])) {
28
+			self::$context[$site] = self::createContext($site);
29 29
 		}
30 30
 
31 31
 		return clone self::$context[$site];
@@ -34,13 +34,13 @@  discard block
 block discarded – undo
34 34
 
35 35
 	private static function getAimeos()
36 36
 	{
37
-		if( !isset( self::$aimeos ) )
37
+		if (!isset(self::$aimeos))
38 38
 		{
39 39
 			require_once 'Bootstrap.php';
40
-			spl_autoload_register( 'Aimeos\\Bootstrap::autoload' );
40
+			spl_autoload_register('Aimeos\\Bootstrap::autoload');
41 41
 
42
-			$extdir = dirname( dirname( dirname( __DIR__ ) ) );
43
-			self::$aimeos = new \Aimeos\Bootstrap( array( $extdir ), true );
42
+			$extdir = dirname(dirname(dirname(__DIR__)));
43
+			self::$aimeos = new \Aimeos\Bootstrap(array($extdir), true);
44 44
 		}
45 45
 
46 46
 		return self::$aimeos;
@@ -50,45 +50,45 @@  discard block
 block discarded – undo
50 50
 	/**
51 51
 	 * @param string $site
52 52
 	 */
53
-	private static function createContext( $site )
53
+	private static function createContext($site)
54 54
 	{
55 55
 		$ctx = new \Aimeos\MShop\Context\Item\Standard();
56 56
 		$aimeos = self::getAimeos();
57 57
 
58 58
 
59
-		$paths = $aimeos->getConfigPaths( 'mysql' );
59
+		$paths = $aimeos->getConfigPaths('mysql');
60 60
 		$paths[] = __DIR__ . DIRECTORY_SEPARATOR . 'config';
61 61
 
62
-		$conf = new \Aimeos\MW\Config\PHPArray( [], $paths );
63
-		$ctx->setConfig( $conf );
62
+		$conf = new \Aimeos\MW\Config\PHPArray([], $paths);
63
+		$ctx->setConfig($conf);
64 64
 
65 65
 
66
-		$dbm = new \Aimeos\MW\DB\Manager\PDO( $conf );
67
-		$ctx->setDatabaseManager( $dbm );
66
+		$dbm = new \Aimeos\MW\DB\Manager\PDO($conf);
67
+		$ctx->setDatabaseManager($dbm);
68 68
 
69 69
 
70
-		$logger = new \Aimeos\MW\Logger\File( $site . '.log', \Aimeos\MW\Logger\Base::DEBUG );
71
-		$ctx->setLogger( $logger );
70
+		$logger = new \Aimeos\MW\Logger\File($site . '.log', \Aimeos\MW\Logger\Base::DEBUG);
71
+		$ctx->setLogger($logger);
72 72
 
73 73
 
74 74
 		$cache = new \Aimeos\MW\Cache\None();
75
-		$ctx->setCache( $cache );
75
+		$ctx->setCache($cache);
76 76
 
77 77
 
78
-		$i18n = new \Aimeos\MW\Translation\None( 'de' );
79
-		$ctx->setI18n( array( 'de' => $i18n ) );
78
+		$i18n = new \Aimeos\MW\Translation\None('de');
79
+		$ctx->setI18n(array('de' => $i18n));
80 80
 
81 81
 
82 82
 		$session = new \Aimeos\MW\Session\None();
83
-		$ctx->setSession( $session );
83
+		$ctx->setSession($session);
84 84
 
85 85
 
86
-		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $ctx );
87
-		$localeItem = $localeManager->bootstrap( $site, '', '', false );
86
+		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($ctx);
87
+		$localeItem = $localeManager->bootstrap($site, '', '', false);
88 88
 
89
-		$ctx->setLocale( $localeItem );
89
+		$ctx->setLocale($localeItem);
90 90
 
91
-		$ctx->setEditor( 'ai-fosuser:unittest' );
91
+		$ctx->setEditor('ai-fosuser:unittest');
92 92
 
93 93
 		return $ctx;
94 94
 	}
Please login to merge, or discard this patch.
lib/custom/src/MShop/Customer/Manager/Lists/Type/FosUser.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
 		'customer.lists.type.id' => array(
26 26
 			'code'=>'customer.lists.type.id',
27 27
 			'internalcode'=>'foslity."id"',
28
-			'internaldeps'=>array( 'LEFT JOIN "fos_user_list_type" AS foslity ON ( fosli."typeid" = foslity."id" )' ),
28
+			'internaldeps'=>array('LEFT JOIN "fos_user_list_type" AS foslity ON ( fosli."typeid" = foslity."id" )'),
29 29
 			'label'=>'Customer list type ID',
30 30
 			'type'=> 'integer',
31 31
 			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT,
@@ -96,14 +96,14 @@  discard block
 block discarded – undo
96 96
 	 *
97 97
 	 * @param array $siteids List of IDs for sites whose entries should be deleted
98 98
 	 */
99
-	public function cleanup( array $siteids )
99
+	public function cleanup(array $siteids)
100 100
 	{
101 101
 		$path = 'mshop/customer/manager/lists/type/submanagers';
102
-		foreach( $this->getContext()->getConfig()->get( $path, [] ) as $domain ) {
103
-			$this->getObject()->getSubManager( $domain )->cleanup( $siteids );
102
+		foreach ($this->getContext()->getConfig()->get($path, []) as $domain) {
103
+			$this->getObject()->getSubManager($domain)->cleanup($siteids);
104 104
 		}
105 105
 
106
-		$this->cleanupBase( $siteids, 'mshop/customer/manager/lists/type/fosuser/delete' );
106
+		$this->cleanupBase($siteids, 'mshop/customer/manager/lists/type/fosuser/delete');
107 107
 	}
108 108
 
109 109
 
@@ -113,11 +113,11 @@  discard block
 block discarded – undo
113 113
 	 * @param boolean $withsub Return also attributes of sub-managers if true
114 114
 	 * @return array List of attribute items implementing \Aimeos\MW\Criteria\Attribute\Iface
115 115
 	 */
116
-	public function getSearchAttributes( $withsub = true )
116
+	public function getSearchAttributes($withsub = true)
117 117
 	{
118 118
 		$path = 'mshop/customer/manager/lists/type/submanagers';
119 119
 
120
-		return $this->getSearchAttributesBase( $this->searchConfig, $path, [], $withsub );
120
+		return $this->getSearchAttributesBase($this->searchConfig, $path, [], $withsub);
121 121
 	}
122 122
 
123 123
 
@@ -128,9 +128,9 @@  discard block
 block discarded – undo
128 128
 	 * @param string|null $name Name of the implementation, will be from configuration (or Default) if null
129 129
 	 * @return mixed Manager for different extensions, e.g stock, tags, locations, etc.
130 130
 	 */
131
-	public function getSubManager( $manager, $name = null )
131
+	public function getSubManager($manager, $name = null)
132 132
 	{
133
-		return $this->getSubManagerBase( 'customer', 'lists/type/' . $manager, ( $name === null ? 'FosUser' : $name ) );
133
+		return $this->getSubManagerBase('customer', 'lists/type/' . $manager, ($name === null ? 'FosUser' : $name));
134 134
 	}
135 135
 
136 136
 
Please login to merge, or discard this patch.
lib/custom/src/MShop/Customer/Manager/Lists/FosUser.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
 		'customer.lists.id'=> array(
26 26
 			'code'=>'customer.lists.id',
27 27
 			'internalcode'=>'fosli."id"',
28
-			'internaldeps' => array( 'LEFT JOIN "fos_user_list" AS fosli ON ( fos."id" = fosli."parentid" )' ),
28
+			'internaldeps' => array('LEFT JOIN "fos_user_list" AS fosli ON ( fos."id" = fosli."parentid" )'),
29 29
 			'label'=>'Customer list ID',
30 30
 			'type'=> 'integer',
31 31
 			'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_INT,
@@ -133,14 +133,14 @@  discard block
 block discarded – undo
133 133
 	 *
134 134
 	 * @param array $siteids List of IDs for sites whose entries should be deleted
135 135
 	 */
136
-	public function cleanup( array $siteids )
136
+	public function cleanup(array $siteids)
137 137
 	{
138 138
 		$path = 'mshop/customer/manager/lists/submanagers';
139
-		foreach( $this->getContext()->getConfig()->get( $path, array( 'type' ) ) as $domain ) {
140
-			$this->getObject()->getSubManager( $domain )->cleanup( $siteids );
139
+		foreach ($this->getContext()->getConfig()->get($path, array('type')) as $domain) {
140
+			$this->getObject()->getSubManager($domain)->cleanup($siteids);
141 141
 		}
142 142
 
143
-		$this->cleanupBase( $siteids, 'mshop/customer/manager/lists/fosuser/delete' );
143
+		$this->cleanupBase($siteids, 'mshop/customer/manager/lists/fosuser/delete');
144 144
 	}
145 145
 
146 146
 
@@ -150,11 +150,11 @@  discard block
 block discarded – undo
150 150
 	 * @param boolean $withsub Return also attributes of sub-managers if true
151 151
 	 * @return array List of attribute items implementing \Aimeos\MW\Criteria\Attribute\Iface
152 152
 	 */
153
-	public function getSearchAttributes( $withsub = true )
153
+	public function getSearchAttributes($withsub = true)
154 154
 	{
155 155
 		$path = 'mshop/customer/manager/lists/submanagers';
156 156
 
157
-		return $this->getSearchAttributesBase( $this->searchConfig, $path, array( 'type' ), $withsub );
157
+		return $this->getSearchAttributesBase($this->searchConfig, $path, array('type'), $withsub);
158 158
 	}
159 159
 
160 160
 
@@ -165,9 +165,9 @@  discard block
 block discarded – undo
165 165
 	 * @param string|null $name Name of the implementation, will be from configuration (or Default) if null
166 166
 	 * @return mixed Manager for different extensions, e.g stock, tags, locations, etc.
167 167
 	 */
168
-	public function getSubManager( $manager, $name = null )
168
+	public function getSubManager($manager, $name = null)
169 169
 	{
170
-		return $this->getSubManagerBase( 'customer', 'lists/' . $manager, ( $name === null ? 'FosUser' : $name ) );
170
+		return $this->getSubManagerBase('customer', 'lists/' . $manager, ($name === null ? 'FosUser' : $name));
171 171
 	}
172 172
 
173 173
 
Please login to merge, or discard this patch.
lib/custom/setup/CustomerChangeAddressRefidParentidFosUser.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
 	 */
41 41
 	public function getPostDependencies()
42 42
 	{
43
-		return array( 'TablesCreateFosUser' );
43
+		return array('TablesCreateFosUser');
44 44
 	}
45 45
 
46 46
 
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
 	 */
50 50
 	public function migrate()
51 51
 	{
52
-		$this->process( $this->mysql );
52
+		$this->process($this->mysql);
53 53
 	}
54 54
 
55 55
 
@@ -58,22 +58,22 @@  discard block
 block discarded – undo
58 58
 	 *
59 59
 	 * array string $stmts List of SQL statements for changing the columns
60 60
 	 */
61
-	protected function process( array $stmts )
61
+	protected function process(array $stmts)
62 62
 	{
63 63
 		$table = 'fos_user_address';
64
-		$this->msg( sprintf( 'Rename "refid" to "parentid" in table "%1$s"', $table ), 0 ); $this->status( '' );
64
+		$this->msg(sprintf('Rename "refid" to "parentid" in table "%1$s"', $table), 0); $this->status('');
65 65
 
66
-		foreach( $stmts as $column => $stmts )
66
+		foreach ($stmts as $column => $stmts)
67 67
 		{
68
-			$this->msg( sprintf( 'Checking column "%1$s"', $column ), 1 );
68
+			$this->msg(sprintf('Checking column "%1$s"', $column), 1);
69 69
 
70
-			if( $this->schema->tableExists( $table )
71
-				&& $this->schema->columnExists( $table, $column ) === true
70
+			if ($this->schema->tableExists($table)
71
+				&& $this->schema->columnExists($table, $column) === true
72 72
 			) {
73
-				$this->executeList( $stmts );
74
-				$this->status( 'done' );
73
+				$this->executeList($stmts);
74
+				$this->status('done');
75 75
 			} else {
76
-				$this->status( 'OK' );
76
+				$this->status('OK');
77 77
 			}
78 78
 		}
79 79
 	}
Please login to merge, or discard this patch.
lib/custom/setup/unittest/data/customer-property.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -5,12 +5,12 @@
 block discarded – undo
5 5
  * @copyright Aimeos (aimeos.org), 2018
6 6
  */
7 7
 
8
-return array (
8
+return array(
9 9
 	'customer/property/type' => array(
10
-		'customer/property/type/newsletter' => array( 'domain' => 'customer', 'code' => 'newsletter', 'label' => 'Newsletter', 'status' => 1 ),
10
+		'customer/property/type/newsletter' => array('domain' => 'customer', 'code' => 'newsletter', 'label' => 'Newsletter', 'status' => 1),
11 11
 	),
12 12
 
13 13
 	'customer/property' => array(
14
-		'customer/property/UTC001/newsletter' => array( 'parentid' => 'customer/UTC001', 'typeid' => 'customer/property/type/newsletter', 'langid' => null, 'value' => '1' ),
14
+		'customer/property/UTC001/newsletter' => array('parentid' => 'customer/UTC001', 'typeid' => 'customer/property/type/newsletter', 'langid' => null, 'value' => '1'),
15 15
 	),
16 16
 );
17 17
\ No newline at end of file
Please login to merge, or discard this patch.
lib/custom/src/MShop/Customer/Item/FosUser.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -32,11 +32,11 @@  discard block
 block discarded – undo
32 32
 	 * @param \Aimeos\MShop\Common\Item\Iface[] $refItems List of referenced items
33 33
 	 * @param \Aimeos\MShop\Common\Item\Helper\Password\Iface|null $helper Password encryption helper object
34 34
 	 */
35
-	public function __construct( \Aimeos\MShop\Common\Item\Address\Iface $address,
35
+	public function __construct(\Aimeos\MShop\Common\Item\Address\Iface $address,
36 36
 		array $values = [], array $listItems = [], array $refItems = [], $salt = '',
37
-		\Aimeos\MShop\Common\Item\Helper\Password\Iface $helper = null, array $addresses = [], array $propItems = [] )
37
+		\Aimeos\MShop\Common\Item\Helper\Password\Iface $helper = null, array $addresses = [], array $propItems = [])
38 38
 	{
39
-		parent::__construct( $address, $values, $listItems, $refItems, $salt, $helper, $addresses, $propItems, $propItems );
39
+		parent::__construct($address, $values, $listItems, $refItems, $salt, $helper, $addresses, $propItems, $propItems);
40 40
 
41 41
 		$this->values = $values;
42 42
 		$this->helper = $helper;
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
 	 */
52 52
 	public function getPassword()
53 53
 	{
54
-		if( isset( $this->values['customer.password'] ) ) {
54
+		if (isset($this->values['customer.password'])) {
55 55
 			return (string) $this->values['customer.password'];
56 56
 		}
57 57
 
@@ -65,12 +65,12 @@  discard block
 block discarded – undo
65 65
 	 * @param string $value Password of the customer item
66 66
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item for chaining method calls
67 67
 	 */
68
-	public function setPassword( $value )
68
+	public function setPassword($value)
69 69
 	{
70
-		if( (string) $value !== $this->getPassword() )
70
+		if ((string) $value !== $this->getPassword())
71 71
 		{
72
-			if( $this->helper !== null ) {
73
-				$value = $this->helper->encode( $value, $this->getSalt() );
72
+			if ($this->helper !== null) {
73
+				$value = $this->helper->encode($value, $this->getSalt());
74 74
 			}
75 75
 
76 76
 			$this->values['customer.password'] = (string) $value;
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
 	 */
89 89
 	public function getRoles()
90 90
 	{
91
-		if( isset( $this->values['roles'] ) ) {
91
+		if (isset($this->values['roles'])) {
92 92
 			return (array) $this->values['roles'];
93 93
 		}
94 94
 
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
 	 *
102 102
 	 * @param array $roles List of Symfony roles
103 103
 	 */
104
-	public function setRoles( array $roles )
104
+	public function setRoles(array $roles)
105 105
 	{
106 106
 		$this->values['roles'] = $roles;
107 107
 		$this->setModified();
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
 	 */
118 118
 	public function getSalt()
119 119
 	{
120
-		if( isset( $this->values['salt'] ) ) {
120
+		if (isset($this->values['salt'])) {
121 121
 			return $this->values['salt'];
122 122
 		}
123 123
 
@@ -130,9 +130,9 @@  discard block
 block discarded – undo
130 130
 	 *
131 131
 	 * @param string $value Password salt
132 132
 	 */
133
-	public function setSalt( $value )
133
+	public function setSalt($value)
134 134
 	{
135
-		if( (string) $value !== $this->getSalt() )
135
+		if ((string) $value !== $this->getSalt())
136 136
 		{
137 137
 			$this->values['salt'] = (string) $value;
138 138
 			$this->setModified();
Please login to merge, or discard this patch.
lib/custom/setup/CustomerRemoveLostUserDataFosuser.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 	 */
39 39
 	public function getPostDependencies()
40 40
 	{
41
-		return array( 'TablesCreateMShop' );
41
+		return array('TablesCreateMShop');
42 42
 	}
43 43
 
44 44
 
@@ -47,29 +47,29 @@  discard block
 block discarded – undo
47 47
 	 */
48 48
 	public function migrate()
49 49
 	{
50
-		$this->msg( 'Remove left over FOS user address records', 0 );
50
+		$this->msg('Remove left over FOS user address records', 0);
51 51
 
52
-		if( $this->schema->tableExists( 'fos_user' ) && $this->schema->tableExists( 'fos_user_address' ) )
52
+		if ($this->schema->tableExists('fos_user') && $this->schema->tableExists('fos_user_address'))
53 53
 		{
54
-			$this->execute( $this->sql['address'] );
55
-			$this->status( 'done' );
54
+			$this->execute($this->sql['address']);
55
+			$this->status('done');
56 56
 		}
57 57
 		else
58 58
 		{
59
-			$this->status( 'OK' );
59
+			$this->status('OK');
60 60
 		}
61 61
 
62 62
 
63
-		$this->msg( 'Remove left over FOS user list records', 0 );
63
+		$this->msg('Remove left over FOS user list records', 0);
64 64
 
65
-		if( $this->schema->tableExists( 'fos_user' ) && $this->schema->tableExists( 'fos_user_list' ) )
65
+		if ($this->schema->tableExists('fos_user') && $this->schema->tableExists('fos_user_list'))
66 66
 		{
67
-			$this->execute( $this->sql['list'] );
68
-			$this->status( 'done' );
67
+			$this->execute($this->sql['list']);
68
+			$this->status('done');
69 69
 		}
70 70
 		else
71 71
 		{
72
-			$this->status( 'OK' );
72
+			$this->status('OK');
73 73
 		}
74 74
 	}
75 75
 }
Please login to merge, or discard this patch.