aimeos / aimeos-core

controller/common/tests/Controller/Common/Media/StandardTest.php

Doc Comments +3 added lines

@@ -335,6 +335,9 @@
 	}
 
 
+	/**
+	 * @param string $name
+	 */
 	protected function access( $name )
 	{
 		$class = new \ReflectionClass( '\Aimeos\Controller\Common\Media\Standard' );

Spacing +15 added lines, -15 removed lines

@@ -40,7 +40,7 @@ 
 
 		$file = $this->getMockBuilder( '\Psr\Http\Message\UploadedFileInterface' )->getMock();
 		$file->expects( $this->once() )->method( 'getStream' )
-			->will( $this->returnValue( file_get_contents( __DIR__ . '/testfiles/test.gif' ) ) );
+			->will( $this->returnValue( file_get_contents( __DIR__.'/testfiles/test.gif' ) ) );
 
 		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'media' )->createItem();
 
@@ -60,7 +60,7 @@ 
 
 		$file = $this->getMockBuilder( '\Psr\Http\Message\UploadedFileInterface' )->getMock();
 		$file->expects( $this->once() )->method( 'getStream' )
-			->will( $this->returnValue( file_get_contents( __DIR__ . '/testfiles/test.pdf' ) ) );
+			->will( $this->returnValue( file_get_contents( __DIR__.'/testfiles/test.pdf' ) ) );
 
 		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'media' )->createItem();
 
@@ -108,7 +108,7 @@ 
 			->getMock();
 
 		$object->expects( $this->once() )->method( 'getFileContent' )
-			->will( $this->returnValue( file_get_contents( __DIR__ . '/testfiles/test.png' ) ) );
+			->will( $this->returnValue( file_get_contents( __DIR__.'/testfiles/test.png' ) ) );
 
 		$object->expects( $this->exactly( 2 ) )->method( 'storeFile' );
 
@@ -204,9 +204,9 @@ 
 
 	public function testGetFileContent()
 	{
-		$dest = dirname( dirname( dirname( __DIR__ ) ) ) . '/tmp/';
+		$dest = dirname( dirname( dirname( __DIR__ ) ) ).'/tmp/';
 		if( !is_dir( $dest ) ) { mkdir( $dest, 0755, true ); }
-		copy( __DIR__ . '/testfiles/test.gif', $dest . 'test.gif' );
+		copy( __DIR__.'/testfiles/test.gif', $dest.'test.gif' );
 
 		$result = $this->access( 'getFileContent' )->invokeArgs( $this->object, array( 'test.gif', 'fs-media' ) );
 
@@ -296,7 +296,7 @@ 
 
 	public function testGetMimeType()
 	{
-		$file = \Aimeos\MW\Media\Factory::get( __DIR__ . '/testfiles/test.png' );
+		$file = \Aimeos\MW\Media\Factory::get( __DIR__.'/testfiles/test.png' );
 
 		$result = $this->access( 'getMimeType' )->invokeArgs( $this->object, array( $file, 'files' ) );
 		$this->assertEquals( 'image/png', $result );
@@ -305,7 +305,7 @@ 
 
 	public function testGetMimeTypeNotAllowed()
 	{
-		$file = \Aimeos\MW\Media\Factory::get( __DIR__ . '/testfiles/test.gif' );
+		$file = \Aimeos\MW\Media\Factory::get( __DIR__.'/testfiles/test.gif' );
 		$this->context->getConfig()->set( 'controller/common/media/standard/files/allowedtypes', array( 'image/jpeg' ) );
 
 		$result = $this->access( 'getMimeType' )->invokeArgs( $this->object, array( $file, 'files' ) );
@@ -315,7 +315,7 @@ 
 
 	public function testGetMimeTypeNoTypes()
 	{
-		$file = \Aimeos\MW\Media\Factory::get( __DIR__ . '/testfiles/test.gif' );
+		$file = \Aimeos\MW\Media\Factory::get( __DIR__.'/testfiles/test.gif' );
 		$this->context->getConfig()->set( 'controller/common/media/standard/files/allowedtypes', [] );
 
 		$this->setExpectedException( '\Aimeos\Controller\Common\Exception' );
@@ -325,7 +325,7 @@ 
 
 	public function testScaleImage()
 	{
-		$file = \Aimeos\MW\Media\Factory::get( __DIR__ . '/testfiles/test.gif' );
+		$file = \Aimeos\MW\Media\Factory::get( __DIR__.'/testfiles/test.gif' );
 
 		$this->access( 'scaleImage' )->invokeArgs( $this->object, array( $file, 'files' ) );
 	}
@@ -333,18 +333,18 @@ 
 
 	public function testStoreFile()
 	{
-		$content = file_get_contents( __DIR__ . '/testfiles/test.gif' );
+		$content = file_get_contents( __DIR__.'/testfiles/test.gif' );
 
-		$dest = dirname( dirname( dirname( __DIR__ ) ) ) . '/tmp/';
+		$dest = dirname( dirname( dirname( __DIR__ ) ) ).'/tmp/';
 		if( !is_dir( $dest ) ) { mkdir( $dest, 0755, true ); }
-		copy( __DIR__ . '/testfiles/test.gif', $dest . 'test2.gif' );
+		copy( __DIR__.'/testfiles/test.gif', $dest.'test2.gif' );
 
 		$this->access( 'storeFile' )->invokeArgs( $this->object, array( $content, 'fs-media', 'test.gif', 'test2.gif' ) );
 
-		$this->assertFalse( file_exists( $dest . 'test2.gif' ) );
-		$this->assertTrue( file_exists( $dest . 'test.gif' ) );
+		$this->assertFalse( file_exists( $dest.'test2.gif' ) );
+		$this->assertTrue( file_exists( $dest.'test.gif' ) );
 
-		unlink( $dest . 'test.gif' );
+		unlink( $dest.'test.gif' );
 	}
 
 

lib/mshoplib/src/MShop/Locale/Manager/Currency/Standard.php

Doc Comments +2 added lines, -2 removed lines

@@ -605,7 +605,7 @@ 
 	 * Returns the search results for the given SQL statement.
 	 *
 	 * @param \Aimeos\MW\DB\Connection\Iface $conn Database connection
-	 * @param $sql SQL statement
+	 * @param string $sql SQL statement
 	 * @return \Aimeos\MW\DB\Result\Iface Search result object
 	 */
 	protected function getSearchResults( \Aimeos\MW\DB\Connection\Iface $conn, $sql )
@@ -635,7 +635,7 @@ 
 	 * Returns the total number of items found for the conditions
 	 *
 	 * @param \Aimeos\MW\DB\Connection\Iface $conn Database connection
-	 * @param array $find List of markers that should be replaced in the SQL statement
+	 * @param string[] $find List of markers that should be replaced in the SQL statement
 	 * @param array $replace List of replacements for the markers in the SQL statement
 	 * @throws \Aimeos\MShop\Locale\Exception If no total value was found
 	 * @return integer Total number of found items

Braces +6 added lines, -4 removed lines

@@ -105,9 +105,12 @@ 
 	 */
 	public function createItem()
 	{
-		try {
+		try
+		{
 			$values = array( 'locale.currency.siteid' => $this->getContext()->getLocale()->getSiteId() );
-		} catch( \Exception $ex ) {
+		}
+		catch( \Exception $ex )
+		{
 			$values = array( 'locale.currency.siteid' => null );
 		}
 
@@ -177,8 +180,7 @@ 
 				 * @see mshop/locale/manager/currency/standard/count/ansi
 				 */
 				$path = 'mshop/locale/manager/currency/standard/insert';
-			}
-			else
+			} else
 			{
 				/** mshop/locale/manager/currency/standard/update/mysql
 				 * Updates an existing currency record in the database

Spacing +3 added lines, -3 removed lines

@@ -378,7 +378,7 @@ 
 			$replace = array(
 				$search->getConditionString( $types, $translations ),
 				$search->getSortationString( $types, $translations ),
-				( $columns ? ', ' . $columns : '' ),
+				( $columns ? ', '.$columns : '' ),
 				$search->getSliceStart(),
 				$search->getSliceSize(),
 			);
@@ -590,7 +590,7 @@ 
 		 * @see mshop/locale/manager/currency/decorators/global
 		 */
 
-		return $this->getSubManagerBase( 'locale', 'currency/' . $manager, $name );
+		return $this->getSubManagerBase( 'locale', 'currency/'.$manager, $name );
 	}
 
 
@@ -637,7 +637,7 @@ 
 		$statement = $conn->create( $sql );
 		$level = \Aimeos\MW\Logger\Base::DEBUG;
 
-		$this->getContext()->getLogger()->log( __METHOD__ . ': SQL statement: ' . $statement, $level, 'core/sql' );
+		$this->getContext()->getLogger()->log( __METHOD__.': SQL statement: '.$statement, $level, 'core/sql' );
 
 		$results = $statement->execute();
 

lib/mshoplib/src/MShop/Index/Manager/Price/Standard.php

Spacing +2 added lines, -2 removed lines

@@ -402,7 +402,7 @@ 
 		 * @see mshop/index/manager/price/decorators/global
 		 */
 
-		return $this->getSubManagerBase( 'index', 'price/' . $manager, $name );
+		return $this->getSubManagerBase( 'index', 'price/'.$manager, $name );
 	}
 
 
@@ -733,7 +733,7 @@ 
 
 				try {
 					$stmt->execute()->finish();
-				} catch( \Aimeos\MW\DB\Exception $e ) { ; } // Ignore duplicates
+				} catch( \Aimeos\MW\DB\Exception $e ) {; } // Ignore duplicates
 			}
 		}
 	}

Braces +6 added lines, -2 removed lines

@@ -726,9 +726,13 @@
 				$stmt->bind( 13, $siteid, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
 				$stmt->bind( 14, $date ); //ctime
 
-				try {
+				try
+				{
 					$stmt->execute()->finish();
-				} catch( \Aimeos\MW\DB\Exception $e ) { ; } // Ignore duplicates
+				}
+				catch( \Aimeos\MW\DB\Exception $e )
+				{
+; } // Ignore duplicates
 			}
 		}
 	}

lib/mshoplib/src/MShop/Index/Manager/Attribute/Standard.php

Spacing +2 added lines, -2 removed lines

@@ -358,7 +358,7 @@ 
 		 * @see mshop/index/manager/attribute/decorators/global
 		 */
 
-		return $this->getSubManagerBase( 'index', 'attribute/' . $manager, $name );
+		return $this->getSubManagerBase( 'index', 'attribute/'.$manager, $name );
 	}
 
 
@@ -683,7 +683,7 @@ 
 
 				try {
 					$stmt->execute()->finish();
-				} catch( \Aimeos\MW\DB\Exception $e ) { ; } // Ignore duplicates
+				} catch( \Aimeos\MW\DB\Exception $e ) {; } // Ignore duplicates
 			}
 		}
 	}

Braces +6 added lines, -2 removed lines

@@ -676,9 +676,13 @@
 				$stmt->bind( 8, $siteid, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
 				$stmt->bind( 9, $date ); // ctime
 
-				try {
+				try
+				{
 					$stmt->execute()->finish();
-				} catch( \Aimeos\MW\DB\Exception $e ) { ; } // Ignore duplicates
+				}
+				catch( \Aimeos\MW\DB\Exception $e )
+				{
+; } // Ignore duplicates
 			}
 		}
 	}

lib/mshoplib/src/MShop/Index/Manager/Catalog/Standard.php

Spacing +2 added lines, -2 removed lines

@@ -366,7 +366,7 @@ 
 		 * @see mshop/index/manager/catalog/decorators/global
 		 */
 
-		return $this->getSubManagerBase( 'index', 'catalog/' . $manager, $name );
+		return $this->getSubManagerBase( 'index', 'catalog/'.$manager, $name );
 	}
 
 
@@ -485,7 +485,7 @@ 
 
 					try {
 						$stmt->execute()->finish();
-					} catch( \Aimeos\MW\DB\Exception $e ) { ; } // Ignore duplicates
+					} catch( \Aimeos\MW\DB\Exception $e ) {; } // Ignore duplicates
 				}
 			}
 

Braces +6 added lines, -2 removed lines

@@ -483,9 +483,13 @@
 					$stmt->bind( 7, $siteid, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
 					$stmt->bind( 8, $date ); //ctime
 
-					try {
+					try
+					{
 						$stmt->execute()->finish();
-					} catch( \Aimeos\MW\DB\Exception $e ) { ; } // Ignore duplicates
+					}
+					catch( \Aimeos\MW\DB\Exception $e )
+					{
+; } // Ignore duplicates
 				}
 			}
 

lib/mshoplib/setup/unittest/CustomerAddTestData.php

Spacing +2 added lines, -2 removed lines

@@ -52,7 +52,7 @@ 
 		$ds = DIRECTORY_SEPARATOR;
 		$this->additional->setEditor( 'core:unittest' );
 
-		$this->process( __DIR__ . $ds . 'data' . $ds . 'customer.php' );
+		$this->process( __DIR__.$ds.'data'.$ds.'customer.php' );
 
 		$this->status( 'done' );
 
@@ -207,7 +207,7 @@ 
 
 			try {
 				$customerGroupManager->saveItem( $group, false );
-			} catch( \Exception $e ) { ; } // ignore duplicates
+			} catch( \Exception $e ) {; } // ignore duplicates
 		}
 	}
 }
\ No newline at end of file

Braces +6 added lines, -2 removed lines

@@ -205,9 +205,13 @@
 			$group->setCode( $dataset['code'] );
 			$group->setLabel( $dataset['label'] );
 
-			try {
+			try
+			{
 				$customerGroupManager->saveItem( $group, false );
-			} catch( \Exception $e ) { ; } // ignore duplicates
+			}
+			catch( \Exception $e )
+			{
+; } // ignore duplicates
 		}
 	}
 }
\ No newline at end of file

lib/mshoplib/setup/MShopAddTypeData.php

Braces +6 added lines, -2 removed lines

@@ -100,10 +100,14 @@
 				$type->setLabel( $dataset['label'] );
 				$type->setStatus( $dataset['status'] );
 
-				try {
+				try
+				{
 					$domainManager->saveItem( $type );
 					$num++;
-				} catch( \Exception $e ) { ; } // if type was already available
+				}
+				catch( \Exception $e )
+				{
+; } // if type was already available
 			}
 
 			$this->status( $num > 0 ? $num . '/' . $total : 'OK' );

Spacing +6 added lines, -6 removed lines

@@ -66,7 +66,7 @@ 
 
 
 		$ds = DIRECTORY_SEPARATOR;
-		$filename = __DIR__ . $ds . 'default' . $ds . 'data' . $ds . 'type.php';
+		$filename = __DIR__.$ds.'default'.$ds.'data'.$ds.'type.php';
 
 		if( ( $testdata = include( $filename ) ) == false ) {
 			throw new \Aimeos\MShop\Exception( sprintf( 'No type file found in "%1$s"', $filename ) );
@@ -103,10 +103,10 @@ 
 				try {
 					$domainManager->saveItem( $type );
 					$num++;
-				} catch( \Exception $e ) { ; } // if type was already available
+				} catch( \Exception $e ) {; } // if type was already available
 			}
 
-			$this->status( $num > 0 ? $num . '/' . $total : 'OK' );
+			$this->status( $num > 0 ? $num.'/'.$total : 'OK' );
 		}
 
 		$this->additional->setEditor( $editor );
@@ -147,8 +147,8 @@ 
 			if( !isset( $this->domainManagers[$domainname] ) )
 			{
 				$iface = '\\Aimeos\\MShop\\Common\\Manager\\Iface';
-				$factory = '\\Aimeos\\MShop\\' . ucwords( $domainname ) . '\\Manager\\Factory';
-				$manager = call_user_func_array( $factory . '::createManager', array( $this->additional ) );
+				$factory = '\\Aimeos\\MShop\\'.ucwords( $domainname ).'\\Manager\\Factory';
+				$manager = call_user_func_array( $factory.'::createManager', array( $this->additional ) );
 
 				if( !( $manager instanceof $iface ) ) {
 					throw new \RuntimeException( sprintf( 'No factory "%1$s" found', $factory ) );
@@ -160,7 +160,7 @@ 
 
 			foreach( $parts as $part )
 			{
-				$tmpname = $domainname . '/' . $part;
+				$tmpname = $domainname.'/'.$part;
 
 				if( !isset( $this->domainManagers[$tmpname] ) ) {
 					$this->domainManagers[$tmpname] = $this->domainManagers[$domainname]->getSubManager( $part );

lib/mwlib/tests/MW/View/Helper/Access/StandardTest.php

Braces +12 added lines, -4 removed lines

@@ -14,7 +14,9 @@ 
 	public function testTransformSingleOK()
 	{
 		$view = new \Aimeos\MW\View\Standard();
-		$fcn = function() { return array( 'editor' ); };
+		$fcn = function()
+		{
+return array( 'editor' ); };
 
 		$object = new \Aimeos\MW\View\Helper\Access\Standard( $view, $fcn );
 		$this->assertTrue( $object->transform( 'editor' ) );
@@ -24,7 +26,9 @@ 
 	public function testTransformSingleFailure()
 	{
 		$view = new \Aimeos\MW\View\Standard();
-		$fcn = function() { return array( 'editor' ); };
+		$fcn = function()
+		{
+return array( 'editor' ); };
 
 		$object = new \Aimeos\MW\View\Helper\Access\Standard( $view, $fcn );
 		$this->assertFalse( $object->transform( 'admin' ) );
@@ -34,7 +38,9 @@ 
 	public function testTransformMultipleOK()
 	{
 		$view = new \Aimeos\MW\View\Standard();
-		$fcn = function() { return array( 'admin', 'editor' ); };
+		$fcn = function()
+		{
+return array( 'admin', 'editor' ); };
 
 		$object = new \Aimeos\MW\View\Helper\Access\Standard( $view, $fcn );
 		$this->assertTrue( $object->transform( array( 'editor' ) ) );
@@ -44,7 +50,9 @@ 
 	public function testTransformMultipleFailure()
 	{
 		$view = new \Aimeos\MW\View\Standard();
-		$fcn = function() { return array( 'admin', 'editor' ); };
+		$fcn = function()
+		{
+return array( 'admin', 'editor' ); };
 
 		$object = new \Aimeos\MW\View\Helper\Access\Standard( $view, $fcn );
 		$this->assertFalse( $object->transform( array( 'test', 'example' ) ) );

lib/mshoplib/setup/OrderAddTimes.php

Spacing +1 added lines, -1 removed lines

@@ -161,7 +161,7 @@
 
 				$stmt->bind( 1, $date );
 				$stmt->bind( 2, substr( $date, 0, 7 ) );
-				$stmt->bind( 3, date_create_from_format( 'Y-m-d', $date )->format( 'Y-W' )  );
+				$stmt->bind( 3, date_create_from_format( 'Y-m-d', $date )->format( 'Y-W' ) );
 				$stmt->bind( 4, substr( $time, 0, 2 ) );
 				$stmt->bind( 5, $id, \Aimeos\MW\DB\Statement\Base::PARAM_INT );