aimeos / ai-laravel

lib/custom/tests/TestHelper.php

Spacing +24 added lines, -24 removed lines

@@ -12,14 +12,14 @@ 
 
 		$includepaths = $aimeos->getIncludePaths();
 		$includepaths[] = get_include_path();
-		set_include_path( implode( PATH_SEPARATOR, $includepaths ) );
+		set_include_path(implode(PATH_SEPARATOR, $includepaths));
 	}
 
 
-	public static function getContext( $site = 'unittest' )
+	public static function getContext($site = 'unittest')
 	{
-		if( !isset( self::$context[$site] ) ) {
-			self::$context[$site] = self::createContext( $site );
+		if (!isset(self::$context[$site])) {
+			self::$context[$site] = self::createContext($site);
 		}
 
 		return clone self::$context[$site];
@@ -28,54 +28,54 @@ 
 
 	private static function getAimeos()
 	{
-		if( !isset( self::$aimeos ) )
+		if (!isset(self::$aimeos))
 		{
 			require_once 'Bootstrap.php';
-			spl_autoload_register( 'Aimeos\\Bootstrap::autoload' );
+			spl_autoload_register('Aimeos\\Bootstrap::autoload');
 
-			$extdir = dirname( dirname( dirname( __DIR__ ) ) );
-			self::$aimeos = new \Aimeos\Bootstrap( array( $extdir ), false );
+			$extdir = dirname(dirname(dirname(__DIR__)));
+			self::$aimeos = new \Aimeos\Bootstrap(array($extdir), false);
 		}
 
 		return self::$aimeos;
 	}
 
 
-	private static function createContext( $site )
+	private static function createContext($site)
 	{
 		$ctx = new \Aimeos\MShop\Context\Item\Standard();
 		$aimeos = self::getAimeos();
 
 
-		$paths = $aimeos->getConfigPaths( 'mysql' );
-		$paths[] = __DIR__ . DIRECTORY_SEPARATOR . 'config';
+		$paths = $aimeos->getConfigPaths('mysql');
+		$paths[] = __DIR__.DIRECTORY_SEPARATOR.'config';
 
-		$conf = new \Aimeos\MW\Config\PHPArray( array(), $paths );
-		$ctx->setConfig( $conf );
+		$conf = new \Aimeos\MW\Config\PHPArray(array(), $paths);
+		$ctx->setConfig($conf);
 
 
-		$dbm = new \Aimeos\MW\DB\Manager\PDO( $conf );
-		$ctx->setDatabaseManager( $dbm );
+		$dbm = new \Aimeos\MW\DB\Manager\PDO($conf);
+		$ctx->setDatabaseManager($dbm);
 
 
-		$logger = new \Aimeos\MW\Logger\File( $site . '.log', \Aimeos\MW\Logger\Base::DEBUG );
-		$ctx->setLogger( $logger );
+		$logger = new \Aimeos\MW\Logger\File($site.'.log', \Aimeos\MW\Logger\Base::DEBUG);
+		$ctx->setLogger($logger);
 
 
-		$i18n = new \Aimeos\MW\Translation\None( 'de' );
-		$ctx->setI18n( array( 'de' => $i18n ) );
+		$i18n = new \Aimeos\MW\Translation\None('de');
+		$ctx->setI18n(array('de' => $i18n));
 
 
 		$session = new \Aimeos\MW\Session\None();
-		$ctx->setSession( $session );
+		$ctx->setSession($session);
 
 
-		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $ctx );
-		$localeItem = $localeManager->bootstrap( $site, '', '', false );
+		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($ctx);
+		$localeItem = $localeManager->bootstrap($site, '', '', false);
 
-		$ctx->setLocale( $localeItem );
+		$ctx->setLocale($localeItem);
 
-		$ctx->setEditor( 'ai-laravel:unittest' );
+		$ctx->setEditor('ai-laravel:unittest');
 
 		return $ctx;
 	}

lib/custom/src/MW/Filesystem/Laravel.php

Indentation +2 added lines, -2 removed lines

@@ -52,7 +52,7 @@ 
 	 * @param string $path Path to the directory
 	 * @return void
 	 * @throws \Aimeos\MW\Filesystem\Exception If an error occurs
-	*/
+	 */
 	public function mkdir( $path )
 	{
 		try {
@@ -69,7 +69,7 @@ 
 	 * @param string $path Path to the directory
 	 * @return void
 	 * @throws \Aimeos\MW\Filesystem\Exception If an error occurs
-	*/
+	 */
 	public function rmdir( $path )
 	{
 		try {

Spacing +70 added lines, -70 removed lines

@@ -29,7 +29,7 @@ 
 	 * @param \Illuminate\Contracts\Filesystem\Filesystem $fs Laravel file system object
 	 * @param string $tempdir Directory for storing temporary files
 	 */
-	public function __construct( \Illuminate\Contracts\Filesystem\Filesystem $fs, $tempdir )
+	public function __construct(\Illuminate\Contracts\Filesystem\Filesystem $fs, $tempdir)
 	{
 		$this->fs = $fs;
 		$this->tempdir = $tempdir;
@@ -43,9 +43,9 @@ 
 	 * @return boolean True if directory, false if not
 	 * @throws \Aimeos\MW\Filesystem\Exception If an error occurs
 	 */
-	public function isdir( $path )
+	public function isdir($path)
 	{
-		return in_array( basename( $path ), $this->fs->directories( dirname( $path ) ) );
+		return in_array(basename($path), $this->fs->directories(dirname($path)));
 	}
 
 
@@ -56,12 +56,12 @@ 
 	 * @return void
 	 * @throws \Aimeos\MW\Filesystem\Exception If an error occurs
 	*/
-	public function mkdir( $path )
+	public function mkdir($path)
 	{
 		try {
-			$this->fs->makeDirectory( $path );
-		} catch( \Exception $e ) {
-			throw new Exception( $e->getMessage(), 0, $e );
+			$this->fs->makeDirectory($path);
+		} catch (\Exception $e) {
+			throw new Exception($e->getMessage(), 0, $e);
 		}
 	}
 
@@ -73,12 +73,12 @@ 
 	 * @return void
 	 * @throws \Aimeos\MW\Filesystem\Exception If an error occurs
 	*/
-	public function rmdir( $path )
+	public function rmdir($path)
 	{
 		try {
-			$this->fs->deleteDirectory( $path );
-		} catch( \Exception $e ) {
-			throw new Exception( $e->getMessage(), 0, $e );
+			$this->fs->deleteDirectory($path);
+		} catch (\Exception $e) {
+			throw new Exception($e->getMessage(), 0, $e);
 		}
 	}
 
@@ -92,12 +92,12 @@ 
 	 * @return \Iterator|array Iterator over the entries or array with entries
 	 * @throws \Aimeos\MW\Filesystem\Exception If an error occurs
 	 */
-	public function scan( $path = null )
+	public function scan($path = null)
 	{
 		try {
-			return array_merge( $this->fs->directories( $path ), $this->fs->files( $path ) );
-		} catch( \Exception $e ) {
-			throw new Exception( $e->getMessage(), 0, $e );
+			return array_merge($this->fs->directories($path), $this->fs->files($path));
+		} catch (\Exception $e) {
+			throw new Exception($e->getMessage(), 0, $e);
 		}
 	}
 
@@ -109,12 +109,12 @@ 
 	 * @return integer Size in bytes
 	 * @throws \Aimeos\MW\Filesystem\Exception If an error occurs
 	 */
-	public function size( $path )
+	public function size($path)
 	{
 		try {
-			return $this->fs->size( $path );
-		} catch( \Exception $e ) {
-			throw new Exception( $e->getMessage(), 0, $e );
+			return $this->fs->size($path);
+		} catch (\Exception $e) {
+			throw new Exception($e->getMessage(), 0, $e);
 		}
 	}
 
@@ -126,12 +126,12 @@ 
 	 * @return integer Unix time stamp in seconds
 	 * @throws \Aimeos\MW\Filesystem\Exception If an error occurs
 	 */
-	public function time( $path )
+	public function time($path)
 	{
 		try {
-			return $this->fs->lastModified( $path );
-		} catch( \Exception $e ) {
-			throw new Exception( $e->getMessage(), 0, $e );
+			return $this->fs->lastModified($path);
+		} catch (\Exception $e) {
+			throw new Exception($e->getMessage(), 0, $e);
 		}
 	}
 
@@ -143,12 +143,12 @@ 
 	 * @return void
 	 * @throws \Aimeos\MW\Filesystem\Exception If an error occurs
 	 */
-	public function rm( $path )
+	public function rm($path)
 	{
 		try {
-			$this->fs->delete( $path );
-		} catch( \Exception $e ) {
-			throw new Exception( $e->getMessage(), 0, $e );
+			$this->fs->delete($path);
+		} catch (\Exception $e) {
+			throw new Exception($e->getMessage(), 0, $e);
 		}
 	}
 
@@ -159,9 +159,9 @@ 
 	 * @param string $path Path to the file
 	 * @return boolean True if it exists, false if not
 	 */
-	public function has( $path )
+	public function has($path)
 	{
-		return $this->fs->exists( $path );
+		return $this->fs->exists($path);
 	}
 
 
@@ -174,12 +174,12 @@ 
 	 * @return string File content
 	 * @throws \Aimeos\MW\Filesystem\Exception If an error occurs
 	 */
-	public function read( $path )
+	public function read($path)
 	{
 		try {
-			return $this->fs->get( $path );
-		} catch( \Exception $e ) {
-			throw new Exception( $e->getMessage(), 0, $e );
+			return $this->fs->get($path);
+		} catch (\Exception $e) {
+			throw new Exception($e->getMessage(), 0, $e);
 		}
 	}
 
@@ -191,14 +191,14 @@ 
 	 * @return string Path of the local file
 	 * @throws \Aimeos\MW\Filesystem\Exception If an error occurs
 	 */
-	public function readf( $path )
+	public function readf($path)
 	{
-		if( ( $filename = tempnam( $this->tempdir, 'ai-' ) ) === false ) {
-			throw new Exception( sprintf( 'Unable to create file in "%1$s"', $this->tempdir ) );
+		if (($filename = tempnam($this->tempdir, 'ai-')) === false) {
+			throw new Exception(sprintf('Unable to create file in "%1$s"', $this->tempdir));
 		}
 
-		if( @file_put_contents( $filename, $this->fs->get( $path ) ) === false ) {
-			throw new Exception( sprintf( 'Couldn\'t write file "%1$s"', $filename ) );
+		if (@file_put_contents($filename, $this->fs->get($path)) === false) {
+			throw new Exception(sprintf('Couldn\'t write file "%1$s"', $filename));
 		}
 
 		return $filename;
@@ -214,24 +214,24 @@ 
 	 * @return resource File stream descriptor
 	 * @throws \Aimeos\MW\Filesystem\Exception If an error occurs
 	 */
-	public function reads( $path )
+	public function reads($path)
 	{
 		try {
-			$content = $this->fs->get( $path );
-		} catch( \Exception $e ) {
-			throw new Exception( $e->getMessage(), 0, $e );
+			$content = $this->fs->get($path);
+		} catch (\Exception $e) {
+			throw new Exception($e->getMessage(), 0, $e);
 		}
 
-		if( ( $stream = tmpfile() ) === false ) {
-			throw new Exception( 'Couldn\'t create temporary file' );
+		if (($stream = tmpfile()) === false) {
+			throw new Exception('Couldn\'t create temporary file');
 		}
 
-		if( fwrite( $stream, $content ) === false ) {
-			throw new Exception( 'Couldn\'t write to temporary file' );
+		if (fwrite($stream, $content) === false) {
+			throw new Exception('Couldn\'t write to temporary file');
 		}
 
-		if( rewind( $stream ) === false ) {
-			throw new Exception( 'Couldn\'t rewind temporary file' );
+		if (rewind($stream) === false) {
+			throw new Exception('Couldn\'t rewind temporary file');
 		}
 
 		return $stream;
@@ -248,12 +248,12 @@ 
 	 * @return void
 	 * @throws \Aimeos\MW\Filesystem\Exception If an error occurs
 	 */
-	public function write( $path, $content )
+	public function write($path, $content)
 	{
 		try {
-			$this->fs->put( $path, $content );
-		} catch( \Exception $e ) {
-			throw new Exception( $e->getMessage(), 0, $e );
+			$this->fs->put($path, $content);
+		} catch (\Exception $e) {
+			throw new Exception($e->getMessage(), 0, $e);
 		}
 	}
 
@@ -268,13 +268,13 @@ 
 	 * @return void
 	 * @throws \Aimeos\MW\Filesystem\Exception If an error occurs
 	 */
-	public function writef( $path, $local )
+	public function writef($path, $local)
 	{
-		if( ( $content = @file_get_contents( $local ) ) === false ) {
-			throw new Exception( sprintf( 'Couldn\'t read file "%1$s"', $local ) );
+		if (($content = @file_get_contents($local)) === false) {
+			throw new Exception(sprintf('Couldn\'t read file "%1$s"', $local));
 		}
 
-		$this->write( $path, $content );
+		$this->write($path, $content);
 	}
 
 
@@ -288,17 +288,17 @@ 
 	 * @return void
 	 * @throws \Aimeos\MW\Filesystem\Exception If an error occurs
 	 */
-	public function writes( $path, $stream )
+	public function writes($path, $stream)
 	{
-		if( ( $content = @fread( $stream, 0x7ffffffd ) ) === false ) {
+		if (($content = @fread($stream, 0x7ffffffd)) === false) {
 			$error = error_get_last();
-			throw new Exception( $error['message'] );
+			throw new Exception($error['message']);
 		}
 
 		try {
-			$content = $this->fs->put( $path, $content );
-		} catch( \Exception $e ) {
-			throw new Exception( $e->getMessage(), 0, $e );
+			$content = $this->fs->put($path, $content);
+		} catch (\Exception $e) {
+			throw new Exception($e->getMessage(), 0, $e);
 		}
 	}
 
@@ -311,12 +311,12 @@ 
 	 * @return void
 	 * @throws \Aimeos\MW\Filesystem\Exception If an error occurs
 	 */
-	public function move( $from, $to )
+	public function move($from, $to)
 	{
 		try {
-			$this->fs->move( $from, $to );
-		} catch( \Exception $e ) {
-			throw new Exception( $e->getMessage(), 0, $e );
+			$this->fs->move($from, $to);
+		} catch (\Exception $e) {
+			throw new Exception($e->getMessage(), 0, $e);
 		}
 	}
 
@@ -329,12 +329,12 @@ 
 	 * @return void
 	 * @throws \Aimeos\MW\Filesystem\Exception If an error occurs
 	 */
-	public function copy( $from, $to )
+	public function copy($from, $to)
 	{
 		try {
-			$this->fs->copy( $from, $to );
-		} catch( \Exception $e ) {
-			throw new Exception( $e->getMessage(), 0, $e );
+			$this->fs->copy($from, $to);
+		} catch (\Exception $e) {
+			throw new Exception($e->getMessage(), 0, $e);
 		}
 	}
 }

Doc Comments -1 removed lines

@@ -264,7 +264,6 @@
 	 * {@inheritDoc}
 	 *
 	 * @param string $path Path to the remote file
-	 * @param string $file Path to the local file
 	 * @return void
 	 * @throws \Aimeos\MW\Filesystem\Exception If an error occurs
 	 */

lib/custom/setup/unittest/data/customer-list.php

Spacing +11 added lines, -11 removed lines

@@ -5,18 +5,18 @@
  * @copyright Aimeos (aimeos.org), 2014
  */
 
-return array (
-	'customer/lists/type' => array (
-		'customer/group/default' => array( 'domain' => 'customer/group', 'code' => 'default', 'label' => 'Standard', 'status' => 1 ),
-		'product/favorite' => array( 'domain' => 'product', 'code' => 'favorite', 'label' => 'Favorite', 'status' => 1 ),
-		'product/watch' => array( 'domain' => 'product', 'code' => 'watch', 'label' => 'Watch list', 'status' => 1 ),
-		'text/default' => array( 'domain' => 'text', 'code' => 'default', 'label' => 'Standard', 'status' => 1 ),
+return array(
+	'customer/lists/type' => array(
+		'customer/group/default' => array('domain' => 'customer/group', 'code' => 'default', 'label' => 'Standard', 'status' => 1),
+		'product/favorite' => array('domain' => 'product', 'code' => 'favorite', 'label' => 'Favorite', 'status' => 1),
+		'product/watch' => array('domain' => 'product', 'code' => 'watch', 'label' => 'Watch list', 'status' => 1),
+		'text/default' => array('domain' => 'text', 'code' => 'default', 'label' => 'Standard', 'status' => 1),
 	),
 
-	'customer/lists' => array (
-		array( 'parentid' => 'customer/unitCustomer3', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/information', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => array(), 'pos' => 0, 'status' => 1 ),
-		array( 'parentid' => 'customer/unitCustomer3', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/notify', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => array(), 'pos' => 1, 'status' => 1 ),
-		array( 'parentid' => 'customer/unitCustomer3', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/newsletter', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => array(), 'pos' => 2, 'status' => 1 ),
-		array( 'parentid' => 'customer/unitCustomer1', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/information', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => array(), 'pos' => 3, 'status' => 1 ),
+	'customer/lists' => array(
+		array('parentid' => 'customer/unitCustomer3', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/information', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => array(), 'pos' => 0, 'status' => 1),
+		array('parentid' => 'customer/unitCustomer3', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/notify', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => array(), 'pos' => 1, 'status' => 1),
+		array('parentid' => 'customer/unitCustomer3', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/newsletter', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => array(), 'pos' => 2, 'status' => 1),
+		array('parentid' => 'customer/unitCustomer1', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/information', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => array(), 'pos' => 3, 'status' => 1),
 	),
 );
\ No newline at end of file

lib/custom/setup/unittest/CustomerAddLaravelTestData.php

Spacing +21 added lines, -21 removed lines

@@ -21,7 +21,7 @@ 
 	 */
 	public function getPreDependencies()
 	{
-		return array( 'TablesAddLaravelTestData' );
+		return array('TablesAddLaravelTestData');
 	}
 
 
@@ -31,36 +31,36 @@ 
 	protected function process()
 	{
 		$iface = '\\Aimeos\\MShop\\Context\\Item\\Iface';
-		if( !( $this->additional instanceof $iface ) ) {
-			throw new \Aimeos\MW\Setup\Exception( sprintf( 'Additionally provided object is not of type "%1$s"', $iface ) );
+		if (!($this->additional instanceof $iface)) {
+			throw new \Aimeos\MW\Setup\Exception(sprintf('Additionally provided object is not of type "%1$s"', $iface));
 		}
 
-		$this->msg( 'Adding Laravel customer test data', 0 );
-		$this->additional->setEditor( 'ai-laravel:unittest' );
+		$this->msg('Adding Laravel customer test data', 0);
+		$this->additional->setEditor('ai-laravel:unittest');
 
 		$parentIds = array();
 		$ds = DIRECTORY_SEPARATOR;
-		$path = __DIR__ . $ds . 'data' . $ds . 'customer.php';
+		$path = __DIR__.$ds.'data'.$ds.'customer.php';
 
-		if( ( $testdata = include( $path ) ) == false ){
-			throw new \Aimeos\MShop\Exception( sprintf( 'No file "%1$s" found for customer domain', $path ) );
+		if (($testdata = include($path)) == false) {
+			throw new \Aimeos\MShop\Exception(sprintf('No file "%1$s" found for customer domain', $path));
 		}
 
 
-		$customerManager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $this->additional, 'Laravel' );
-		$customerAddressManager = $customerManager->getSubManager( 'address', 'Laravel' );
+		$customerManager = \Aimeos\MShop\Customer\Manager\Factory::createManager($this->additional, 'Laravel');
+		$customerAddressManager = $customerManager->getSubManager('address', 'Laravel');
 
-		$this->cleanupCustomerData( $customerManager, $customerAddressManager );
+		$this->cleanupCustomerData($customerManager, $customerAddressManager);
 
 		$this->conn->begin();
 
-		$parentIds = $this->addCustomerData( $testdata, $customerManager, $customerAddressManager->createItem() );
-		$this->addCustomerAddressData( $testdata, $customerAddressManager, $parentIds );
+		$parentIds = $this->addCustomerData($testdata, $customerManager, $customerAddressManager->createItem());
+		$this->addCustomerAddressData($testdata, $customerAddressManager, $parentIds);
 
 		$this->conn->commit();
 
 
-		$this->status( 'done' );
+		$this->status('done');
 	}
 
 
@@ -70,17 +70,17 @@ 
 	 * @param \Aimeos\MShop\Common\Manager\Iface $customerManager Customer manager
 	 * @param \Aimeos\MShop\Common\Manager\Iface $customerAddressManager Customer address manager
 	 */
-	protected function cleanupCustomerData( \Aimeos\MShop\Common\Manager\Iface $customerManager, \Aimeos\MShop\Common\Manager\Iface $customerAddressManager )
+	protected function cleanupCustomerData(\Aimeos\MShop\Common\Manager\Iface $customerManager, \Aimeos\MShop\Common\Manager\Iface $customerAddressManager)
 	{
 		$search = $customerManager->createSearch();
-		$search->setConditions( $search->compare( '=~', 'customer.code', 'unitCustomer' ) );
-		$customerItems = $customerManager->searchItems( $search );
+		$search->setConditions($search->compare('=~', 'customer.code', 'unitCustomer'));
+		$customerItems = $customerManager->searchItems($search);
 
 		$search = $customerAddressManager->createSearch();
-		$search->setConditions( $search->compare( '=~', 'customer.address.email', 'unitCustomer' ) );
-		$addressItems = $customerAddressManager->searchItems( $search );
+		$search->setConditions($search->compare('=~', 'customer.address.email', 'unitCustomer'));
+		$addressItems = $customerAddressManager->searchItems($search);
 
-		$customerAddressManager->deleteItems( array_keys( $addressItems ) );
-		$customerManager->deleteItems( array_keys( $customerItems ) );
+		$customerAddressManager->deleteItems(array_keys($addressItems));
+		$customerManager->deleteItems(array_keys($customerItems));
 	}
 }

lib/custom/src/MW/Filesystem/Manager/Laravel.php

Spacing +8 added lines, -8 removed lines

@@ -31,9 +31,9 @@ 
 	 * @param \Aimeos\MW\Config\Iface $config Configuration object
 	 * @param string $tempdir Directory for storing temporary files
 	 */
-	public function __construct( \Illuminate\Filesystem\FilesystemManager $fsm, \Aimeos\MW\Config\Iface $config, $tempdir )
+	public function __construct(\Illuminate\Filesystem\FilesystemManager $fsm, \Aimeos\MW\Config\Iface $config, $tempdir)
 	{
-		parent::__construct( $config );
+		parent::__construct($config);
 
 		$this->fsm = $fsm;
 		$this->tempdir = $tempdir;
@@ -47,19 +47,19 @@ 
 	 * @return \Aimeos\MW\Filesystem\Iface File system object
 	 * @throws \Aimeos\MW\Filesystem\Exception If an no configuration for that name is found
 	 */
-	public function get( $name )
+	public function get($name)
 	{
-		$key = $this->getConfig( $name );
+		$key = $this->getConfig($name);
 
-		if( is_string( $key ) )
+		if (is_string($key))
 		{
-			if( !isset( $this->objects[$key] ) ) {
-				$this->objects[$key] = new \Aimeos\MW\Filesystem\Laravel( $this->fsm->disk( $key ), $this->tempdir );
+			if (!isset($this->objects[$key])) {
+				$this->objects[$key] = new \Aimeos\MW\Filesystem\Laravel($this->fsm->disk($key), $this->tempdir);
 			}
 
 			return $this->objects[$key];
 		}
 
-		return parent::get( $name );
+		return parent::get($name);
 	}
 }

lib/custom/tests/MW/Filesystem/Manager/LaravelTest.php

Spacing +16 added lines, -16 removed lines

@@ -12,50 +12,50 @@
 
 	protected function setUp()
 	{
-		if( !class_exists( '\Illuminate\Filesystem\FilesystemManager' ) ) {
-			$this->markTestSkipped( 'Install the Laravel framework first' );
+		if (!class_exists('\Illuminate\Filesystem\FilesystemManager')) {
+			$this->markTestSkipped('Install the Laravel framework first');
 		}
 
-		$this->storage = $this->getMockBuilder( '\Illuminate\Filesystem\FilesystemManager' )
-			->setMethods( array( 'get' ) )
+		$this->storage = $this->getMockBuilder('\Illuminate\Filesystem\FilesystemManager')
+			->setMethods(array('get'))
 			->disableOriginalConstructor()
 			->getMock();
 
-		$this->config = new \Aimeos\MW\Config\Decorator\Memory( new \Aimeos\MW\Config\PHPArray( array(), array() ) );
-		$this->object = new \Aimeos\MW\Filesystem\Manager\Laravel( $this->storage, $this->config, sys_get_temp_dir() );
+		$this->config = new \Aimeos\MW\Config\Decorator\Memory(new \Aimeos\MW\Config\PHPArray(array(), array()));
+		$this->object = new \Aimeos\MW\Filesystem\Manager\Laravel($this->storage, $this->config, sys_get_temp_dir());
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->config, $this->object, $this->storage );
+		unset($this->config, $this->object, $this->storage);
 	}
 
 
 	public function testGet()
 	{
-		$fs = $this->getMockBuilder( 'Illuminate\Contracts\Filesystem\Filesystem' )
+		$fs = $this->getMockBuilder('Illuminate\Contracts\Filesystem\Filesystem')
 			->disableOriginalConstructor()
 			->getMock();
 
-		$this->storage->expects( $this->once() )->method( 'get' )
-			->will( $this->returnValue( $fs ) );
+		$this->storage->expects($this->once())->method('get')
+			->will($this->returnValue($fs));
 
-		$this->config->set( 'resource/fs-media', 'local' );
-		$this->assertInstanceof( 'Aimeos\MW\Filesystem\Iface', $this->object->get( 'fs-media' ) );
+		$this->config->set('resource/fs-media', 'local');
+		$this->assertInstanceof('Aimeos\MW\Filesystem\Iface', $this->object->get('fs-media'));
 	}
 
 
 	public function testGetFallback()
 	{
-		$this->config->set( 'resource/fs', array( 'adapter' => 'Standard', 'basedir' => __DIR__ ) );
-		$this->assertInstanceof( 'Aimeos\MW\Filesystem\Iface', $this->object->get( 'fs-media' ) );
+		$this->config->set('resource/fs', array('adapter' => 'Standard', 'basedir' => __DIR__));
+		$this->assertInstanceof('Aimeos\MW\Filesystem\Iface', $this->object->get('fs-media'));
 	}
 
 
 	public function testGetException()
 	{
-		$this->setExpectedException( 'Aimeos\MW\Filesystem\Exception' );
-		$this->object->get( 'fs-media' );
+		$this->setExpectedException('Aimeos\MW\Filesystem\Exception');
+		$this->object->get('fs-media');
 	}
 }

lib/custom/src/MW/View/Helper/Request/Laravel5.php

Braces +1 added lines, -2 removed lines

@@ -98,8 +98,7 @@
 					$value->getClientMimeType(),
 					$value->getError()
 				);
-			}
-			elseif( is_array( $value ) )
+			} elseif( is_array( $value ) )
 			{
 				$list[$key] = $this->createUploadedFiles( $value );
 			}

Spacing +16 added lines, -16 removed lines

@@ -34,11 +34,11 @@ 
 	 * @param \\Aimeos\MW\View\Iface $view View instance with registered view helpers
 	 * @param \Illuminate\Http\Request $request Laravel request object
 	 */
-	public function __construct( \Aimeos\MW\View\Iface $view, \Illuminate\Http\Request $request )
+	public function __construct(\Aimeos\MW\View\Iface $view, \Illuminate\Http\Request $request)
 	{
 		$this->request = $request;
 
-		parent::__construct( $view, $this->createRequest( $request ) );
+		parent::__construct($view, $this->createRequest($request));
 	}
 
 
@@ -60,7 +60,7 @@ 
 	 */
 	public function getTarget()
 	{
-		if( ( $route = $this->request->route() ) !== null ) {
+		if (($route = $this->request->route()) !== null) {
 			return $route->getName();
 		}
 	}
@@ -72,10 +72,10 @@ 
 	 * @param \Illuminate\Http\Request $nativeRequest Laravel request object
 	 * @return \Psr\Http\Message\ServerRequestInterface PSR-7 request object
 	 */
-	protected function createRequest( \Illuminate\Http\Request $nativeRequest )
+	protected function createRequest(\Illuminate\Http\Request $nativeRequest)
 	{
-		$files = ServerRequestFactory::normalizeFiles( $this->getFiles( $nativeRequest->files->all() ) );
-		$server = ServerRequestFactory::normalizeServer( $nativeRequest->server->all() );
+		$files = ServerRequestFactory::normalizeFiles($this->getFiles($nativeRequest->files->all()));
+		$server = ServerRequestFactory::normalizeServer($nativeRequest->server->all());
 		$headers = $nativeRequest->headers->all();
 		$cookies = $nativeRequest->cookies->all();
 		$post = $nativeRequest->request->all();
@@ -83,13 +83,13 @@ 
 		$method = $nativeRequest->getMethod();
 		$uri = $nativeRequest->getUri();
 
-		$body = new Stream( 'php://temp', 'wb+' );
-		$body->write( $nativeRequest->getContent() );
+		$body = new Stream('php://temp', 'wb+');
+		$body->write($nativeRequest->getContent());
 
-		$request = new ServerRequest( $server, $files, $uri, $method, $body, $headers, $cookies, $query, $post );
+		$request = new ServerRequest($server, $files, $uri, $method, $body, $headers, $cookies, $query, $post);
 
-		foreach( $nativeRequest->attributes->all() as $key => $value ) {
-			$request = $request->withAttribute( $key, $value );
+		foreach ($nativeRequest->attributes->all() as $key => $value) {
+			$request = $request->withAttribute($key, $value);
 		}
 
 		return $request;
@@ -102,13 +102,13 @@ 
 	 * @param array $files Multi-dimensional list of uploaded files from Symfony request
 	 * @return array Multi-dimensional list of uploaded files as PSR-7 objects
 	 */
-	protected function getFiles( array $files )
+	protected function getFiles(array $files)
 	{
 		$list = array();
 
-		foreach( $files as $key => $value )
+		foreach ($files as $key => $value)
 		{
-			if( $value instanceof \Symfony\Component\HttpFoundation\File\UploadedFile )
+			if ($value instanceof \Symfony\Component\HttpFoundation\File\UploadedFile)
 			{
 				$list[$key] = new \Zend\Diactoros\UploadedFile(
 					$value->getRealPath(),
@@ -118,9 +118,9 @@ 
 					$value->getClientMimeType()
 				);
 			}
-			elseif( is_array( $value ) )
+			elseif (is_array($value))
 			{
-				$list[$key] = $this->getFiles( $value );
+				$list[$key] = $this->getFiles($value);
 			}
 		}
 

Doc Comments +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
 	/**
 	 * Initializes the request view helper.
 	 *
-	 * @param \\Aimeos\MW\View\Iface $view View instance with registered view helpers
+	 * @param \Aimeos\MW\View\Iface $view View instance with registered view helpers
 	 * @param \Illuminate\Http\Request $request Laravel request object
 	 */
 	public function __construct( \Aimeos\MW\View\Iface $view, \Illuminate\Http\Request $request )

lib/custom/src/MW/View/Helper/Response/Laravel5.php

Spacing +2 added lines, -2 removed lines

@@ -26,8 +26,8 @@
 	 *
 	 * @param \Aimeos\MW\View\Iface $view View instance with registered view helpers
 	 */
-	public function __construct( \Aimeos\MW\View\Iface $view )
+	public function __construct(\Aimeos\MW\View\Iface $view)
 	{
-		parent::__construct( $view, new \Zend\Diactoros\Response() );
+		parent::__construct($view, new \Zend\Diactoros\Response());
 	}
 }

lib/custom/tests/MW/View/Helper/Request/Laravel5Test.php

Spacing +11 added lines, -11 removed lines

@@ -17,42 +17,42 @@
 
 	protected function setUp()
 	{
-		if( !class_exists( '\Illuminate\Http\Request' ) ) {
-			$this->markTestSkipped( '\Illuminate\Http\Request is not available' );
+		if (!class_exists('\Illuminate\Http\Request')) {
+			$this->markTestSkipped('\Illuminate\Http\Request is not available');
 		}
 
-		if( !class_exists( '\Zend\Diactoros\Response' ) ) {
-			$this->markTestSkipped( '\Zend\Diactoros\Response is not available' );
+		if (!class_exists('\Zend\Diactoros\Response')) {
+			$this->markTestSkipped('\Zend\Diactoros\Response is not available');
 		}
 
 		$view = new \Aimeos\MW\View\Standard();
-		$param = array( 'HTTP_HOST' => 'localhost', 'REMOTE_ADDR' => '127.0.0.1' );
-		$request = new \Illuminate\Http\Request( array(), array(), array(), array(), array(), $param, 'Content' );
+		$param = array('HTTP_HOST' => 'localhost', 'REMOTE_ADDR' => '127.0.0.1');
+		$request = new \Illuminate\Http\Request(array(), array(), array(), array(), array(), $param, 'Content');
 
-		$this->object = new \Aimeos\MW\View\Helper\Request\Laravel5( $view, $request );
+		$this->object = new \Aimeos\MW\View\Helper\Request\Laravel5($view, $request);
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->object, $this->mock );
+		unset($this->object, $this->mock);
 	}
 
 
 	public function testTransform()
 	{
-		$this->assertInstanceOf( '\Aimeos\MW\View\Helper\Request\Laravel5', $this->object->transform() );
+		$this->assertInstanceOf('\Aimeos\MW\View\Helper\Request\Laravel5', $this->object->transform());
 	}
 
 
 	public function testGetClientAddress()
 	{
-		$this->assertEquals( '127.0.0.1', $this->object->getClientAddress() );
+		$this->assertEquals('127.0.0.1', $this->object->getClientAddress());
 	}
 
 
 	public function testGetTarget()
 	{
-		$this->assertEquals( null, $this->object->getTarget() );
+		$this->assertEquals(null, $this->object->getTarget());
 	}
 }