Completed
Push — master ( 212c5f...8d6a89 )
by Aimeos
08:59
created
lib/mshoplib/setup/default/schema/supplier.php 2 patches
Braces   +8 added lines, -4 removed lines patch added patch discarded remove patch
@@ -9,7 +9,8 @@  discard block
 block discarded – undo
9 9
 return array(
10 10
 	'table' => array(
11 11
 
12
-		'mshop_supplier' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
12
+		'mshop_supplier' => function ( \Doctrine\DBAL\Schema\Schema $schema )
13
+		{
13 14
 
14 15
 			$table = $schema->createTable( 'mshop_supplier' );
15 16
 
@@ -28,7 +29,8 @@  discard block
 block discarded – undo
28 29
 			return $schema;
29 30
 		},
30 31
 
31
-		'mshop_supplier_address' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
32
+		'mshop_supplier_address' => function ( \Doctrine\DBAL\Schema\Schema $schema )
33
+		{
32 34
 
33 35
 			$table = $schema->createTable( 'mshop_supplier_address' );
34 36
 
@@ -69,7 +71,8 @@  discard block
 block discarded – undo
69 71
 			return $schema;
70 72
 		},
71 73
 
72
-		'mshop_supplier_list_type' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
74
+		'mshop_supplier_list_type' => function ( \Doctrine\DBAL\Schema\Schema $schema )
75
+		{
73 76
 
74 77
 			$table = $schema->createTable( 'mshop_supplier_list_type' );
75 78
 
@@ -92,7 +95,8 @@  discard block
 block discarded – undo
92 95
 			return $schema;
93 96
 		},
94 97
 
95
-		'mshop_supplier_list' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
98
+		'mshop_supplier_list' => function ( \Doctrine\DBAL\Schema\Schema $schema )
99
+		{
96 100
 
97 101
 			$table = $schema->createTable( 'mshop_supplier_list' );
98 102
 
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@  discard block
 block discarded – undo
9 9
 return array(
10 10
 	'table' => array(
11 11
 
12
-		'mshop_supplier' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
12
+		'mshop_supplier' => function( \Doctrine\DBAL\Schema\Schema $schema ) {
13 13
 
14 14
 			$table = $schema->createTable( 'mshop_supplier' );
15 15
 
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
 			$table->addColumn( 'status', 'smallint', [] );
21 21
 			$table->addColumn( 'mtime', 'datetime', [] );
22 22
 			$table->addColumn( 'ctime', 'datetime', [] );
23
-			$table->addColumn( 'editor', 'string', array('length' => 255 ) );
23
+			$table->addColumn( 'editor', 'string', array( 'length' => 255 ) );
24 24
 
25 25
 			$table->setPrimaryKey( array( 'id' ), 'pk_mssup_id' );
26 26
 			$table->addUniqueIndex( array( 'siteid', 'code' ), 'unq_mssup_sid_code' );
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
 			return $schema;
31 31
 		},
32 32
 
33
-		'mshop_supplier_address' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
33
+		'mshop_supplier_address' => function( \Doctrine\DBAL\Schema\Schema $schema ) {
34 34
 
35 35
 			$table = $schema->createTable( 'mshop_supplier_address' );
36 36
 
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
 			$table->addColumn( 'pos', 'smallint', [] );
62 62
 			$table->addColumn( 'mtime', 'datetime', [] );
63 63
 			$table->addColumn( 'ctime', 'datetime', [] );
64
-			$table->addColumn( 'editor', 'string', array('length' => 255 ) );
64
+			$table->addColumn( 'editor', 'string', array( 'length' => 255 ) );
65 65
 
66 66
 			$table->setPrimaryKey( array( 'id' ), 'pk_mssupad_id' );
67 67
 			$table->addIndex( array( 'siteid', 'parentid' ), 'idx_mssupad_sid_rid' );
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 			return $schema;
74 74
 		},
75 75
 
76
-		'mshop_supplier_list_type' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
76
+		'mshop_supplier_list_type' => function( \Doctrine\DBAL\Schema\Schema $schema ) {
77 77
 
78 78
 			$table = $schema->createTable( 'mshop_supplier_list_type' );
79 79
 
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
 			return $schema;
97 97
 		},
98 98
 
99
-		'mshop_supplier_list' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
99
+		'mshop_supplier_list' => function( \Doctrine\DBAL\Schema\Schema $schema ) {
100 100
 
101 101
 			$table = $schema->createTable( 'mshop_supplier_list' );
102 102
 
Please login to merge, or discard this patch.
lib/mwlib/tests/MW/Mail/NoneTest.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@
 block discarded – undo
21 21
 
22 22
 	protected function tearDown()
23 23
 	{
24
-		unset($this->object);
24
+		unset( $this->object );
25 25
 	}
26 26
 
27 27
 
Please login to merge, or discard this patch.
lib/mshoplib/tests/MAdmin/Cache/Proxy/StandardTest.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@
 block discarded – undo
39 39
 		$name = 'MAdminCacheProxyDefaultTest';
40 40
 		$this->context->getConfig()->set( 'madmin/cache/manager/name', $name );
41 41
 
42
-		\Aimeos\MAdmin\Cache\Manager\Factory::injectManager( '\\Aimeos\\MAdmin\\Cache\\Manager\\' . $name, $manager );
42
+		\Aimeos\MAdmin\Cache\Manager\Factory::injectManager( '\\Aimeos\\MAdmin\\Cache\\Manager\\'.$name, $manager );
43 43
 
44 44
 		$this->object = new \Aimeos\MAdmin\Cache\Proxy\Standard( $this->context );
45 45
 	}
Please login to merge, or discard this patch.
lib/mshoplib/setup/unittest/ProductAddPropertyTestData.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
 		$this->additional->setEditor( 'core:unittest' );
52 52
 
53 53
 		$ds = DIRECTORY_SEPARATOR;
54
-		$path = __DIR__ . $ds . 'data' . $ds . 'productproperty.php';
54
+		$path = __DIR__.$ds.'data'.$ds.'productproperty.php';
55 55
 
56 56
 		if( ( $testdata = include( $path ) ) == false ) {
57 57
 			throw new \Aimeos\MShop\Exception( sprintf( 'No file "%1$s" found for product domain', $path ) );
@@ -89,19 +89,19 @@  discard block
 block discarded – undo
89 89
 			$type->setStatus( $dataset['status'] );
90 90
 
91 91
 			$productPropertyTypeManager->saveItem( $type );
92
-			$typeIds[ $key ] = $type->getId();
92
+			$typeIds[$key] = $type->getId();
93 93
 		}
94 94
 
95 95
 		$prodProperty = $productPropertyManager->createItem();
96 96
 		foreach( $testdata['product/property'] as $key => $dataset )
97 97
 		{
98
-			if( !isset( $typeIds[ $dataset['typeid'] ] ) ) {
98
+			if( !isset( $typeIds[$dataset['typeid']] ) ) {
99 99
 				throw new \Aimeos\MW\Setup\Exception( sprintf( 'No product property type ID found for "%1$s"', $dataset['typeid'] ) );
100 100
 			}
101 101
 
102 102
 			$prodProperty->setId( null );
103
-			$prodProperty->setParentId( $prodIds[ $dataset['parentid'] ] );
104
-			$prodProperty->setTypeId( $typeIds[ $dataset['typeid'] ] );
103
+			$prodProperty->setParentId( $prodIds[$dataset['parentid']] );
104
+			$prodProperty->setTypeId( $typeIds[$dataset['typeid']] );
105 105
 			$prodProperty->setLanguageId( $dataset['langid'] );
106 106
 			$prodProperty->setValue( $dataset['value'] );
107 107
 
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
124 124
 		$search = $productManager->createSearch();
125 125
 
126 126
 		foreach( $productManager->searchItems( $search ) as $id => $item ) {
127
-			$entry[ 'product/' . $item->getCode() ] = $id;
127
+			$entry['product/'.$item->getCode()] = $id;
128 128
 		}
129 129
 
130 130
 		return $entry;
Please login to merge, or discard this patch.
lib/mshoplib/setup/unittest/data/productproperty.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@
 block discarded – undo
5 5
  * @copyright Aimeos (aimeos.org), 2014-2015
6 6
  */
7 7
 
8
-return array (
8
+return array(
9 9
 	'product/property/type' => array(
10 10
 		'product/property/type/packheight' => array( 'domain' => 'product', 'code' => 'package-height', 'label' => 'Package height', 'status' => 1 ),
11 11
 		'product/property/type/packlength' => array( 'domain' => 'product', 'code' => 'package-length', 'label' => 'Package lenght', 'status' => 1 ),
Please login to merge, or discard this patch.
lib/mshoplib/setup/MShopAddLocaleLangCurData.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
 		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $this->additional, 'Standard' );
55 55
 
56 56
 
57
-		$filename = __DIR__ . $ds . 'default'.  $ds . 'data'. $ds . 'language.php';
57
+		$filename = __DIR__.$ds.'default'.$ds.'data'.$ds.'language.php';
58 58
 
59 59
 		if( ( $data = include( $filename ) ) == false ) {
60 60
 			throw new \Aimeos\MW\Setup\Exception( sprintf( 'No data file "%1$s" found', $filename ) );
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
 		}
66 66
 
67 67
 
68
-		$filename = __DIR__ . $ds . 'default'.  $ds . 'data'. $ds . 'currency.php';
68
+		$filename = __DIR__.$ds.'default'.$ds.'data'.$ds.'currency.php';
69 69
 
70 70
 		if( ( $data = include( $filename ) ) == false ) {
71 71
 			throw new \Aimeos\MW\Setup\Exception( sprintf( 'No data file "%1$s" found', $filename ) );
Please login to merge, or discard this patch.
lib/mshoplib/src/MShop/Product/Item/Property/Standard.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
 	 */
61 61
 	public function setLanguageId( $id )
62 62
 	{
63
-		if ( $id == $this->getLanguageId() ) { return $this; }
63
+		if( $id == $this->getLanguageId() ) { return $this; }
64 64
 
65 65
 		$this->values['product.property.languageid'] = $this->checkLanguageId( $id );
66 66
 		$this->setModified();
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
 	 */
140 140
 	public function setTypeId( $id )
141 141
 	{
142
-		if ( $id == $this->getTypeId() ) { return $this; }
142
+		if( $id == $this->getTypeId() ) { return $this; }
143 143
 
144 144
 		$this->values['product.property.typeid'] = (int) $id;
145 145
 		$this->setModified();
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
 	 */
172 172
 	public function setValue( $value )
173 173
 	{
174
-		if ( $value == $this->getValue() ) { return $this; }
174
+		if( $value == $this->getValue() ) { return $this; }
175 175
 
176 176
 		$this->values['product.property.value'] = (string) $value;
177 177
 		$this->setModified();
Please login to merge, or discard this patch.
lib/mshoplib/src/MShop/Product/Manager/Property/Type/Standard.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -281,7 +281,7 @@
 block discarded – undo
281 281
 		 * @see mshop/product/manager/property/type/decorators/global
282 282
 		 */
283 283
 
284
-		return $this->getSubManagerBase( 'product', 'property/type/' . $manager, $name );
284
+		return $this->getSubManagerBase( 'product', 'property/type/'.$manager, $name );
285 285
 	}
286 286
 
287 287
 
Please login to merge, or discard this patch.
lib/mshoplib/src/MShop/Common/Item/Helper/Password/Hash.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -55,11 +55,11 @@
 block discarded – undo
55 55
 		$iterations = ( isset( $this->options['iterations'] ) ? (int) $this->options['iterations'] : 1 );
56 56
 		
57 57
 		$salted = sprintf( $format, $password, $salt );
58
-		$digest = hash( $this->options['algorithm'], $salted, true);
58
+		$digest = hash( $this->options['algorithm'], $salted, true );
59 59
 		
60 60
 		// "stretch" hash
61
-		for ($i = 1; $i < $iterations; $i++ ) {
62
-			$digest = hash( $this->options['algorithm'], $digest . $salted, true);
61
+		for( $i = 1; $i < $iterations; $i++ ) {
62
+			$digest = hash( $this->options['algorithm'], $digest.$salted, true );
63 63
 		}
64 64
 		
65 65
 		return ( $encode ? base64_encode( $digest ) : bin2hex( $digest ) );
Please login to merge, or discard this patch.