@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | */ |
| 41 | 41 | public function getPostDependencies() |
| 42 | 42 | { |
| 43 | - return array( 'TablesCreateLaravel' ); |
|
| 43 | + return array('TablesCreateLaravel'); |
|
| 44 | 44 | } |
| 45 | 45 | |
| 46 | 46 | |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | */ |
| 50 | 50 | protected function mysql() |
| 51 | 51 | { |
| 52 | - $this->process( $this->mysql ); |
|
| 52 | + $this->process($this->mysql); |
|
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | |
@@ -58,22 +58,22 @@ discard block |
||
| 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 = 'users_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 | } |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | 'label' => 'Customer address ID', |
| 27 | 27 | 'code' => 'customer.address.id', |
| 28 | 28 | 'internalcode' => 'lvuad."id"', |
| 29 | - 'internaldeps' => array( 'LEFT JOIN "users_address" AS lvuad ON ( lvu."id" = lvuad."parentid" )' ), |
|
| 29 | + 'internaldeps' => array('LEFT JOIN "users_address" AS lvuad ON ( lvu."id" = lvuad."parentid" )'), |
|
| 30 | 30 | 'type' => 'integer', |
| 31 | 31 | 'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT, |
| 32 | 32 | 'public' => false, |
@@ -209,11 +209,11 @@ discard block |
||
| 209 | 209 | * |
| 210 | 210 | * @param array $siteids List of IDs for sites whose entries should be deleted |
| 211 | 211 | */ |
| 212 | - public function cleanup( array $siteids ) |
|
| 212 | + public function cleanup(array $siteids) |
|
| 213 | 213 | { |
| 214 | 214 | $path = 'mshop/customer/manager/address/submanagers'; |
| 215 | - foreach( $this->getContext()->getConfig()->get( $path, array() ) as $domain ) { |
|
| 216 | - $this->getSubManager( $domain )->cleanup( $siteids ); |
|
| 215 | + foreach ($this->getContext()->getConfig()->get($path, array()) as $domain) { |
|
| 216 | + $this->getSubManager($domain)->cleanup($siteids); |
|
| 217 | 217 | } |
| 218 | 218 | } |
| 219 | 219 | |
@@ -223,10 +223,10 @@ discard block |
||
| 223 | 223 | * |
| 224 | 224 | * @param array $ids List of IDs |
| 225 | 225 | */ |
| 226 | - public function deleteItems( array $ids ) |
|
| 226 | + public function deleteItems(array $ids) |
|
| 227 | 227 | { |
| 228 | 228 | $path = 'mshop/customer/manager/address/laravel/delete'; |
| 229 | - $this->deleteItemsBase( $ids, $path, false ); |
|
| 229 | + $this->deleteItemsBase($ids, $path, false); |
|
| 230 | 230 | } |
| 231 | 231 | |
| 232 | 232 | |
@@ -236,11 +236,11 @@ discard block |
||
| 236 | 236 | * @param boolean $withsub Return also attributes of sub-managers if true |
| 237 | 237 | * @return array List of attribute items implementing \Aimeos\MW\Criteria\Attribute\Iface |
| 238 | 238 | */ |
| 239 | - public function getSearchAttributes( $withsub = true ) |
|
| 239 | + public function getSearchAttributes($withsub = true) |
|
| 240 | 240 | { |
| 241 | 241 | $path = 'mshop/customer/manager/address/submanagers'; |
| 242 | 242 | |
| 243 | - return $this->getSearchAttributesBase( $this->searchConfig, $path, array(), $withsub ); |
|
| 243 | + return $this->getSearchAttributesBase($this->searchConfig, $path, array(), $withsub); |
|
| 244 | 244 | } |
| 245 | 245 | |
| 246 | 246 | |
@@ -251,9 +251,9 @@ discard block |
||
| 251 | 251 | * @param string|null $name Name of the implementation, will be from configuration (or Default) if null |
| 252 | 252 | * @return mixed Manager for different extensions, e.g stock, tags, locations, etc. |
| 253 | 253 | */ |
| 254 | - public function getSubManager( $manager, $name = null ) |
|
| 254 | + public function getSubManager($manager, $name = null) |
|
| 255 | 255 | { |
| 256 | - return $this->getSubManagerBase( 'customer', 'address/' . $manager, ( $name === null ? 'Laravel' : $name ) ); |
|
| 256 | + return $this->getSubManagerBase('customer', 'address/'.$manager, ($name === null ? 'Laravel' : $name)); |
|
| 257 | 257 | } |
| 258 | 258 | |
| 259 | 259 | |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | 'customer.lists.id'=> array( |
| 26 | 26 | 'code'=>'customer.lists.id', |
| 27 | 27 | 'internalcode'=>'lvuli."id"', |
| 28 | - 'internaldeps' => array( 'LEFT JOIN "users_list" AS lvuli ON ( lvu."id" = lvuli."parentid" )' ), |
|
| 28 | + 'internaldeps' => array('LEFT JOIN "users_list" AS lvuli ON ( lvu."id" = lvuli."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 |
||
| 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->getSubManager( $domain )->cleanup( $siteids ); |
|
| 139 | + foreach ($this->getContext()->getConfig()->get($path, array('type')) as $domain) { |
|
| 140 | + $this->getSubManager($domain)->cleanup($siteids); |
|
| 141 | 141 | } |
| 142 | 142 | |
| 143 | - $this->cleanupBase( $siteids, 'mshop/customer/manager/lists/laravel/delete' ); |
|
| 143 | + $this->cleanupBase($siteids, 'mshop/customer/manager/lists/laravel/delete'); |
|
| 144 | 144 | } |
| 145 | 145 | |
| 146 | 146 | |
@@ -150,11 +150,11 @@ discard block |
||
| 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 |
||
| 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 ? 'Laravel' : $name ) ); |
|
| 170 | + return $this->getSubManagerBase('customer', 'lists/'.$manager, ($name === null ? 'Laravel' : $name)); |
|
| 171 | 171 | } |
| 172 | 172 | |
| 173 | 173 | |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | 'customer.lists.type.id' => array( |
| 26 | 26 | 'code'=>'customer.lists.type.id', |
| 27 | 27 | 'internalcode'=>'lvulity."id"', |
| 28 | - 'internaldeps'=>array( 'LEFT JOIN "users_list_type" AS lvulity ON ( lvuli."typeid" = lvulity."id" )' ), |
|
| 28 | + 'internaldeps'=>array('LEFT JOIN "users_list_type" AS lvulity ON ( lvuli."typeid" = lvulity."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 |
||
| 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, array() ) as $domain ) { |
|
| 103 | - $this->getSubManager( $domain )->cleanup( $siteids ); |
|
| 102 | + foreach ($this->getContext()->getConfig()->get($path, array()) as $domain) { |
|
| 103 | + $this->getSubManager($domain)->cleanup($siteids); |
|
| 104 | 104 | } |
| 105 | 105 | |
| 106 | - $this->cleanupBase( $siteids, 'mshop/customer/manager/lists/type/laravel/delete' ); |
|
| 106 | + $this->cleanupBase($siteids, 'mshop/customer/manager/lists/type/laravel/delete'); |
|
| 107 | 107 | } |
| 108 | 108 | |
| 109 | 109 | |
@@ -113,11 +113,11 @@ discard block |
||
| 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, array(), $withsub ); |
|
| 120 | + return $this->getSearchAttributesBase($this->searchConfig, $path, array(), $withsub); |
|
| 121 | 121 | } |
| 122 | 122 | |
| 123 | 123 | |
@@ -128,9 +128,9 @@ discard block |
||
| 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 ? 'Laravel' : $name ) ); |
|
| 133 | + return $this->getSubManagerBase('customer', 'lists/type/'.$manager, ($name === null ? 'Laravel' : $name)); |
|
| 134 | 134 | } |
| 135 | 135 | |
| 136 | 136 | |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | * |
| 30 | 30 | * @param \Illuminate\Contracts\Logging\Log $logger Laravel logger object |
| 31 | 31 | */ |
| 32 | - public function __construct( \Illuminate\Contracts\Logging\Log $logger ) |
|
| 32 | + public function __construct(\Illuminate\Contracts\Logging\Log $logger) |
|
| 33 | 33 | { |
| 34 | 34 | $this->logger = $logger; |
| 35 | 35 | } |
@@ -44,18 +44,18 @@ discard block |
||
| 44 | 44 | * @throws \Aimeos\MW\Logger\Exception If an error occurs in Zend_Log |
| 45 | 45 | * @see \Aimeos\MW\Logger\Base for available log level constants |
| 46 | 46 | */ |
| 47 | - public function log( $message, $priority = \Aimeos\MW\Logger\Base::ERR, $facility = 'message' ) |
|
| 47 | + public function log($message, $priority = \Aimeos\MW\Logger\Base::ERR, $facility = 'message') |
|
| 48 | 48 | { |
| 49 | 49 | try |
| 50 | 50 | { |
| 51 | - if( !is_scalar( $message ) ) { |
|
| 52 | - $message = json_encode( $message ); |
|
| 51 | + if (!is_scalar($message)) { |
|
| 52 | + $message = json_encode($message); |
|
| 53 | 53 | } |
| 54 | 54 | |
| 55 | - $this->logger->log( $message, $this->translatePriority( $priority ) ); |
|
| 55 | + $this->logger->log($message, $this->translatePriority($priority)); |
|
| 56 | 56 | } |
| 57 | - catch( \Exception $e ) { |
|
| 58 | - throw new \Aimeos\MW\Logger\Exception( $e->getMessage(), $e->getCode(), $e ); |
|
| 57 | + catch (\Exception $e) { |
|
| 58 | + throw new \Aimeos\MW\Logger\Exception($e->getMessage(), $e->getCode(), $e); |
|
| 59 | 59 | } |
| 60 | 60 | } |
| 61 | 61 | |
@@ -67,9 +67,9 @@ discard block |
||
| 67 | 67 | * @return integer Log level from Monolog\Logger |
| 68 | 68 | * @throws \Aimeos\MW\Logger\Exception If log level is unknown |
| 69 | 69 | */ |
| 70 | - protected function translatePriority( $priority ) |
|
| 70 | + protected function translatePriority($priority) |
|
| 71 | 71 | { |
| 72 | - switch( $priority ) |
|
| 72 | + switch ($priority) |
|
| 73 | 73 | { |
| 74 | 74 | case \Aimeos\MW\Logger\Base::EMERG: |
| 75 | 75 | return 'emergency'; |
@@ -88,7 +88,7 @@ discard block |
||
| 88 | 88 | case \Aimeos\MW\Logger\Base::DEBUG: |
| 89 | 89 | return 'debug'; |
| 90 | 90 | default: |
| 91 | - throw new \Aimeos\MW\Logger\Exception( 'Invalid log level' ); |
|
| 91 | + throw new \Aimeos\MW\Logger\Exception('Invalid log level'); |
|
| 92 | 92 | } |
| 93 | 93 | } |
| 94 | 94 | } |
| 95 | 95 | \ No newline at end of file |
@@ -12,14 +12,14 @@ discard block |
||
| 12 | 12 | |
| 13 | 13 | $includepaths = $aimeos->getIncludePaths(); |
| 14 | 14 | $includepaths[] = get_include_path(); |
| 15 | - set_include_path( implode( PATH_SEPARATOR, $includepaths ) ); |
|
| 15 | + set_include_path(implode(PATH_SEPARATOR, $includepaths)); |
|
| 16 | 16 | } |
| 17 | 17 | |
| 18 | 18 | |
| 19 | - public static function getContext( $site = 'unittest' ) |
|
| 19 | + public static function getContext($site = 'unittest') |
|
| 20 | 20 | { |
| 21 | - if( !isset( self::$context[$site] ) ) { |
|
| 22 | - self::$context[$site] = self::createContext( $site ); |
|
| 21 | + if (!isset(self::$context[$site])) { |
|
| 22 | + self::$context[$site] = self::createContext($site); |
|
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | return clone self::$context[$site]; |
@@ -28,54 +28,54 @@ discard block |
||
| 28 | 28 | |
| 29 | 29 | private static function getAimeos() |
| 30 | 30 | { |
| 31 | - if( !isset( self::$aimeos ) ) |
|
| 31 | + if (!isset(self::$aimeos)) |
|
| 32 | 32 | { |
| 33 | 33 | require_once 'Bootstrap.php'; |
| 34 | - spl_autoload_register( 'Aimeos\\Bootstrap::autoload' ); |
|
| 34 | + spl_autoload_register('Aimeos\\Bootstrap::autoload'); |
|
| 35 | 35 | |
| 36 | - $extdir = dirname( dirname( dirname( __DIR__ ) ) ); |
|
| 37 | - self::$aimeos = new \Aimeos\Bootstrap( array( $extdir ), false ); |
|
| 36 | + $extdir = dirname(dirname(dirname(__DIR__))); |
|
| 37 | + self::$aimeos = new \Aimeos\Bootstrap(array($extdir), false); |
|
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | return self::$aimeos; |
| 41 | 41 | } |
| 42 | 42 | |
| 43 | 43 | |
| 44 | - private static function createContext( $site ) |
|
| 44 | + private static function createContext($site) |
|
| 45 | 45 | { |
| 46 | 46 | $ctx = new \Aimeos\MShop\Context\Item\Standard(); |
| 47 | 47 | $aimeos = self::getAimeos(); |
| 48 | 48 | |
| 49 | 49 | |
| 50 | - $paths = $aimeos->getConfigPaths( 'mysql' ); |
|
| 51 | - $paths[] = __DIR__ . DIRECTORY_SEPARATOR . 'config'; |
|
| 50 | + $paths = $aimeos->getConfigPaths('mysql'); |
|
| 51 | + $paths[] = __DIR__.DIRECTORY_SEPARATOR.'config'; |
|
| 52 | 52 | |
| 53 | - $conf = new \Aimeos\MW\Config\PHPArray( array(), $paths ); |
|
| 54 | - $ctx->setConfig( $conf ); |
|
| 53 | + $conf = new \Aimeos\MW\Config\PHPArray(array(), $paths); |
|
| 54 | + $ctx->setConfig($conf); |
|
| 55 | 55 | |
| 56 | 56 | |
| 57 | - $dbm = new \Aimeos\MW\DB\Manager\PDO( $conf ); |
|
| 58 | - $ctx->setDatabaseManager( $dbm ); |
|
| 57 | + $dbm = new \Aimeos\MW\DB\Manager\PDO($conf); |
|
| 58 | + $ctx->setDatabaseManager($dbm); |
|
| 59 | 59 | |
| 60 | 60 | |
| 61 | - $logger = new \Aimeos\MW\Logger\File( $site . '.log', \Aimeos\MW\Logger\Base::DEBUG ); |
|
| 62 | - $ctx->setLogger( $logger ); |
|
| 61 | + $logger = new \Aimeos\MW\Logger\File($site.'.log', \Aimeos\MW\Logger\Base::DEBUG); |
|
| 62 | + $ctx->setLogger($logger); |
|
| 63 | 63 | |
| 64 | 64 | |
| 65 | - $i18n = new \Aimeos\MW\Translation\None( 'de' ); |
|
| 66 | - $ctx->setI18n( array( 'de' => $i18n ) ); |
|
| 65 | + $i18n = new \Aimeos\MW\Translation\None('de'); |
|
| 66 | + $ctx->setI18n(array('de' => $i18n)); |
|
| 67 | 67 | |
| 68 | 68 | |
| 69 | 69 | $session = new \Aimeos\MW\Session\None(); |
| 70 | - $ctx->setSession( $session ); |
|
| 70 | + $ctx->setSession($session); |
|
| 71 | 71 | |
| 72 | 72 | |
| 73 | - $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $ctx ); |
|
| 74 | - $localeItem = $localeManager->bootstrap( $site, '', '', false ); |
|
| 73 | + $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($ctx); |
|
| 74 | + $localeItem = $localeManager->bootstrap($site, '', '', false); |
|
| 75 | 75 | |
| 76 | - $ctx->setLocale( $localeItem ); |
|
| 76 | + $ctx->setLocale($localeItem); |
|
| 77 | 77 | |
| 78 | - $ctx->setEditor( 'ai-laravel:unittest' ); |
|
| 78 | + $ctx->setEditor('ai-laravel:unittest'); |
|
| 79 | 79 | |
| 80 | 80 | return $ctx; |
| 81 | 81 | } |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | * @param string $path Path to the directory |
| 53 | 53 | * @return void |
| 54 | 54 | * @throws \Aimeos\MW\Filesystem\Exception If an error occurs |
| 55 | - */ |
|
| 55 | + */ |
|
| 56 | 56 | public function mkdir( $path ) |
| 57 | 57 | { |
| 58 | 58 | try { |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | * @param string $path Path to the directory |
| 70 | 70 | * @return void |
| 71 | 71 | * @throws \Aimeos\MW\Filesystem\Exception If an error occurs |
| 72 | - */ |
|
| 72 | + */ |
|
| 73 | 73 | public function rmdir( $path ) |
| 74 | 74 | { |
| 75 | 75 | try { |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | * @param \Illuminate\Contracts\Filesystem\Filesystem $fs Laravel file system object |
| 30 | 30 | * @param string $tempdir Directory for storing temporary files |
| 31 | 31 | */ |
| 32 | - public function __construct( \Illuminate\Contracts\Filesystem\Filesystem $fs, $tempdir ) |
|
| 32 | + public function __construct(\Illuminate\Contracts\Filesystem\Filesystem $fs, $tempdir) |
|
| 33 | 33 | { |
| 34 | 34 | $this->fs = $fs; |
| 35 | 35 | $this->tempdir = $tempdir; |
@@ -43,9 +43,9 @@ discard block |
||
| 43 | 43 | * @return boolean True if directory, false if not |
| 44 | 44 | * @throws \Aimeos\MW\Filesystem\Exception If an error occurs |
| 45 | 45 | */ |
| 46 | - public function isdir( $path ) |
|
| 46 | + public function isdir($path) |
|
| 47 | 47 | { |
| 48 | - return in_array( basename( $path ), $this->fs->directories( dirname( $path ) ) ); |
|
| 48 | + return in_array(basename($path), $this->fs->directories(dirname($path))); |
|
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | |
@@ -56,12 +56,12 @@ discard block |
||
| 56 | 56 | * @return void |
| 57 | 57 | * @throws \Aimeos\MW\Filesystem\Exception If an error occurs |
| 58 | 58 | */ |
| 59 | - public function mkdir( $path ) |
|
| 59 | + public function mkdir($path) |
|
| 60 | 60 | { |
| 61 | 61 | try { |
| 62 | - $this->fs->makeDirectory( $path ); |
|
| 63 | - } catch( \Exception $e ) { |
|
| 64 | - throw new Exception( $e->getMessage(), 0, $e ); |
|
| 62 | + $this->fs->makeDirectory($path); |
|
| 63 | + } catch (\Exception $e) { |
|
| 64 | + throw new Exception($e->getMessage(), 0, $e); |
|
| 65 | 65 | } |
| 66 | 66 | } |
| 67 | 67 | |
@@ -73,12 +73,12 @@ discard block |
||
| 73 | 73 | * @return void |
| 74 | 74 | * @throws \Aimeos\MW\Filesystem\Exception If an error occurs |
| 75 | 75 | */ |
| 76 | - public function rmdir( $path ) |
|
| 76 | + public function rmdir($path) |
|
| 77 | 77 | { |
| 78 | 78 | try { |
| 79 | - $this->fs->deleteDirectory( $path ); |
|
| 80 | - } catch( \Exception $e ) { |
|
| 81 | - throw new Exception( $e->getMessage(), 0, $e ); |
|
| 79 | + $this->fs->deleteDirectory($path); |
|
| 80 | + } catch (\Exception $e) { |
|
| 81 | + throw new Exception($e->getMessage(), 0, $e); |
|
| 82 | 82 | } |
| 83 | 83 | } |
| 84 | 84 | |
@@ -92,12 +92,12 @@ discard block |
||
| 92 | 92 | * @return \Iterator|array Iterator over the entries or array with entries |
| 93 | 93 | * @throws \Aimeos\MW\Filesystem\Exception If an error occurs |
| 94 | 94 | */ |
| 95 | - public function scan( $path = null ) |
|
| 95 | + public function scan($path = null) |
|
| 96 | 96 | { |
| 97 | 97 | try { |
| 98 | - return array_merge( $this->fs->directories( $path ), $this->fs->files( $path ) ); |
|
| 99 | - } catch( \Exception $e ) { |
|
| 100 | - throw new Exception( $e->getMessage(), 0, $e ); |
|
| 98 | + return array_merge($this->fs->directories($path), $this->fs->files($path)); |
|
| 99 | + } catch (\Exception $e) { |
|
| 100 | + throw new Exception($e->getMessage(), 0, $e); |
|
| 101 | 101 | } |
| 102 | 102 | } |
| 103 | 103 | |
@@ -109,12 +109,12 @@ discard block |
||
| 109 | 109 | * @return integer Size in bytes |
| 110 | 110 | * @throws \Aimeos\MW\Filesystem\Exception If an error occurs |
| 111 | 111 | */ |
| 112 | - public function size( $path ) |
|
| 112 | + public function size($path) |
|
| 113 | 113 | { |
| 114 | 114 | try { |
| 115 | - return $this->fs->size( $path ); |
|
| 116 | - } catch( \Exception $e ) { |
|
| 117 | - throw new Exception( $e->getMessage(), 0, $e ); |
|
| 115 | + return $this->fs->size($path); |
|
| 116 | + } catch (\Exception $e) { |
|
| 117 | + throw new Exception($e->getMessage(), 0, $e); |
|
| 118 | 118 | } |
| 119 | 119 | } |
| 120 | 120 | |
@@ -126,12 +126,12 @@ discard block |
||
| 126 | 126 | * @return integer Unix time stamp in seconds |
| 127 | 127 | * @throws \Aimeos\MW\Filesystem\Exception If an error occurs |
| 128 | 128 | */ |
| 129 | - public function time( $path ) |
|
| 129 | + public function time($path) |
|
| 130 | 130 | { |
| 131 | 131 | try { |
| 132 | - return $this->fs->lastModified( $path ); |
|
| 133 | - } catch( \Exception $e ) { |
|
| 134 | - throw new Exception( $e->getMessage(), 0, $e ); |
|
| 132 | + return $this->fs->lastModified($path); |
|
| 133 | + } catch (\Exception $e) { |
|
| 134 | + throw new Exception($e->getMessage(), 0, $e); |
|
| 135 | 135 | } |
| 136 | 136 | } |
| 137 | 137 | |
@@ -143,12 +143,12 @@ discard block |
||
| 143 | 143 | * @return void |
| 144 | 144 | * @throws \Aimeos\MW\Filesystem\Exception If an error occurs |
| 145 | 145 | */ |
| 146 | - public function rm( $path ) |
|
| 146 | + public function rm($path) |
|
| 147 | 147 | { |
| 148 | 148 | try { |
| 149 | - $this->fs->delete( $path ); |
|
| 150 | - } catch( \Exception $e ) { |
|
| 151 | - throw new Exception( $e->getMessage(), 0, $e ); |
|
| 149 | + $this->fs->delete($path); |
|
| 150 | + } catch (\Exception $e) { |
|
| 151 | + throw new Exception($e->getMessage(), 0, $e); |
|
| 152 | 152 | } |
| 153 | 153 | } |
| 154 | 154 | |
@@ -159,9 +159,9 @@ discard block |
||
| 159 | 159 | * @param string $path Path to the file |
| 160 | 160 | * @return boolean True if it exists, false if not |
| 161 | 161 | */ |
| 162 | - public function has( $path ) |
|
| 162 | + public function has($path) |
|
| 163 | 163 | { |
| 164 | - return $this->fs->exists( $path ); |
|
| 164 | + return $this->fs->exists($path); |
|
| 165 | 165 | } |
| 166 | 166 | |
| 167 | 167 | |
@@ -174,12 +174,12 @@ discard block |
||
| 174 | 174 | * @return string File content |
| 175 | 175 | * @throws \Aimeos\MW\Filesystem\Exception If an error occurs |
| 176 | 176 | */ |
| 177 | - public function read( $path ) |
|
| 177 | + public function read($path) |
|
| 178 | 178 | { |
| 179 | 179 | try { |
| 180 | - return $this->fs->get( $path ); |
|
| 181 | - } catch( \Exception $e ) { |
|
| 182 | - throw new Exception( $e->getMessage(), 0, $e ); |
|
| 180 | + return $this->fs->get($path); |
|
| 181 | + } catch (\Exception $e) { |
|
| 182 | + throw new Exception($e->getMessage(), 0, $e); |
|
| 183 | 183 | } |
| 184 | 184 | } |
| 185 | 185 | |
@@ -191,14 +191,14 @@ discard block |
||
| 191 | 191 | * @return string Path of the local file |
| 192 | 192 | * @throws \Aimeos\MW\Filesystem\Exception If an error occurs |
| 193 | 193 | */ |
| 194 | - public function readf( $path ) |
|
| 194 | + public function readf($path) |
|
| 195 | 195 | { |
| 196 | - if( ( $filename = tempnam( $this->tempdir, 'ai-' ) ) === false ) { |
|
| 197 | - throw new Exception( sprintf( 'Unable to create file in "%1$s"', $this->tempdir ) ); |
|
| 196 | + if (($filename = tempnam($this->tempdir, 'ai-')) === false) { |
|
| 197 | + throw new Exception(sprintf('Unable to create file in "%1$s"', $this->tempdir)); |
|
| 198 | 198 | } |
| 199 | 199 | |
| 200 | - if( @file_put_contents( $filename, $this->fs->get( $path ) ) === false ) { |
|
| 201 | - throw new Exception( sprintf( 'Couldn\'t write file "%1$s"', $filename ) ); |
|
| 200 | + if (@file_put_contents($filename, $this->fs->get($path)) === false) { |
|
| 201 | + throw new Exception(sprintf('Couldn\'t write file "%1$s"', $filename)); |
|
| 202 | 202 | } |
| 203 | 203 | |
| 204 | 204 | return $filename; |
@@ -214,24 +214,24 @@ discard block |
||
| 214 | 214 | * @return resource File stream descriptor |
| 215 | 215 | * @throws \Aimeos\MW\Filesystem\Exception If an error occurs |
| 216 | 216 | */ |
| 217 | - public function reads( $path ) |
|
| 217 | + public function reads($path) |
|
| 218 | 218 | { |
| 219 | 219 | try { |
| 220 | - $content = $this->fs->get( $path ); |
|
| 221 | - } catch( \Exception $e ) { |
|
| 222 | - throw new Exception( $e->getMessage(), 0, $e ); |
|
| 220 | + $content = $this->fs->get($path); |
|
| 221 | + } catch (\Exception $e) { |
|
| 222 | + throw new Exception($e->getMessage(), 0, $e); |
|
| 223 | 223 | } |
| 224 | 224 | |
| 225 | - if( ( $stream = tmpfile() ) === false ) { |
|
| 226 | - throw new Exception( 'Couldn\'t create temporary file' ); |
|
| 225 | + if (($stream = tmpfile()) === false) { |
|
| 226 | + throw new Exception('Couldn\'t create temporary file'); |
|
| 227 | 227 | } |
| 228 | 228 | |
| 229 | - if( fwrite( $stream, $content ) === false ) { |
|
| 230 | - throw new Exception( 'Couldn\'t write to temporary file' ); |
|
| 229 | + if (fwrite($stream, $content) === false) { |
|
| 230 | + throw new Exception('Couldn\'t write to temporary file'); |
|
| 231 | 231 | } |
| 232 | 232 | |
| 233 | - if( rewind( $stream ) === false ) { |
|
| 234 | - throw new Exception( 'Couldn\'t rewind temporary file' ); |
|
| 233 | + if (rewind($stream) === false) { |
|
| 234 | + throw new Exception('Couldn\'t rewind temporary file'); |
|
| 235 | 235 | } |
| 236 | 236 | |
| 237 | 237 | return $stream; |
@@ -248,12 +248,12 @@ discard block |
||
| 248 | 248 | * @return void |
| 249 | 249 | * @throws \Aimeos\MW\Filesystem\Exception If an error occurs |
| 250 | 250 | */ |
| 251 | - public function write( $path, $content ) |
|
| 251 | + public function write($path, $content) |
|
| 252 | 252 | { |
| 253 | 253 | try { |
| 254 | - $this->fs->put( $path, $content ); |
|
| 255 | - } catch( \Exception $e ) { |
|
| 256 | - throw new Exception( $e->getMessage(), 0, $e ); |
|
| 254 | + $this->fs->put($path, $content); |
|
| 255 | + } catch (\Exception $e) { |
|
| 256 | + throw new Exception($e->getMessage(), 0, $e); |
|
| 257 | 257 | } |
| 258 | 258 | } |
| 259 | 259 | |
@@ -268,13 +268,13 @@ discard block |
||
| 268 | 268 | * @return void |
| 269 | 269 | * @throws \Aimeos\MW\Filesystem\Exception If an error occurs |
| 270 | 270 | */ |
| 271 | - public function writef( $path, $local ) |
|
| 271 | + public function writef($path, $local) |
|
| 272 | 272 | { |
| 273 | - if( ( $content = @file_get_contents( $local ) ) === false ) { |
|
| 274 | - throw new Exception( sprintf( 'Couldn\'t read file "%1$s"', $local ) ); |
|
| 273 | + if (($content = @file_get_contents($local)) === false) { |
|
| 274 | + throw new Exception(sprintf('Couldn\'t read file "%1$s"', $local)); |
|
| 275 | 275 | } |
| 276 | 276 | |
| 277 | - $this->write( $path, $content ); |
|
| 277 | + $this->write($path, $content); |
|
| 278 | 278 | } |
| 279 | 279 | |
| 280 | 280 | |
@@ -288,17 +288,17 @@ discard block |
||
| 288 | 288 | * @return void |
| 289 | 289 | * @throws \Aimeos\MW\Filesystem\Exception If an error occurs |
| 290 | 290 | */ |
| 291 | - public function writes( $path, $stream ) |
|
| 291 | + public function writes($path, $stream) |
|
| 292 | 292 | { |
| 293 | - if( ( $content = @fread( $stream, 0x7ffffffd ) ) === false ) { |
|
| 293 | + if (($content = @fread($stream, 0x7ffffffd)) === false) { |
|
| 294 | 294 | $error = error_get_last(); |
| 295 | - throw new Exception( $error['message'] ); |
|
| 295 | + throw new Exception($error['message']); |
|
| 296 | 296 | } |
| 297 | 297 | |
| 298 | 298 | try { |
| 299 | - $this->fs->put( $path, $content ); |
|
| 300 | - } catch( \Exception $e ) { |
|
| 301 | - throw new Exception( $e->getMessage(), 0, $e ); |
|
| 299 | + $this->fs->put($path, $content); |
|
| 300 | + } catch (\Exception $e) { |
|
| 301 | + throw new Exception($e->getMessage(), 0, $e); |
|
| 302 | 302 | } |
| 303 | 303 | } |
| 304 | 304 | |
@@ -311,12 +311,12 @@ discard block |
||
| 311 | 311 | * @return void |
| 312 | 312 | * @throws \Aimeos\MW\Filesystem\Exception If an error occurs |
| 313 | 313 | */ |
| 314 | - public function move( $from, $to ) |
|
| 314 | + public function move($from, $to) |
|
| 315 | 315 | { |
| 316 | 316 | try { |
| 317 | - $this->fs->move( $from, $to ); |
|
| 318 | - } catch( \Exception $e ) { |
|
| 319 | - throw new Exception( $e->getMessage(), 0, $e ); |
|
| 317 | + $this->fs->move($from, $to); |
|
| 318 | + } catch (\Exception $e) { |
|
| 319 | + throw new Exception($e->getMessage(), 0, $e); |
|
| 320 | 320 | } |
| 321 | 321 | } |
| 322 | 322 | |
@@ -329,12 +329,12 @@ discard block |
||
| 329 | 329 | * @return void |
| 330 | 330 | * @throws \Aimeos\MW\Filesystem\Exception If an error occurs |
| 331 | 331 | */ |
| 332 | - public function copy( $from, $to ) |
|
| 332 | + public function copy($from, $to) |
|
| 333 | 333 | { |
| 334 | 334 | try { |
| 335 | - $this->fs->copy( $from, $to ); |
|
| 336 | - } catch( \Exception $e ) { |
|
| 337 | - throw new Exception( $e->getMessage(), 0, $e ); |
|
| 335 | + $this->fs->copy($from, $to); |
|
| 336 | + } catch (\Exception $e) { |
|
| 337 | + throw new Exception($e->getMessage(), 0, $e); |
|
| 338 | 338 | } |
| 339 | 339 | } |
| 340 | 340 | } |
@@ -31,9 +31,9 @@ discard block |
||
| 31 | 31 | * @param \Aimeos\MW\Config\Iface $config Configuration object |
| 32 | 32 | * @param string $tempdir Directory for storing temporary files |
| 33 | 33 | */ |
| 34 | - public function __construct( \Illuminate\Filesystem\FilesystemManager $fsm, \Aimeos\MW\Config\Iface $config, $tempdir ) |
|
| 34 | + public function __construct(\Illuminate\Filesystem\FilesystemManager $fsm, \Aimeos\MW\Config\Iface $config, $tempdir) |
|
| 35 | 35 | { |
| 36 | - parent::__construct( $config ); |
|
| 36 | + parent::__construct($config); |
|
| 37 | 37 | |
| 38 | 38 | $this->fsm = $fsm; |
| 39 | 39 | $this->tempdir = $tempdir; |
@@ -47,19 +47,19 @@ discard block |
||
| 47 | 47 | * @return \Aimeos\MW\Filesystem\Iface File system object |
| 48 | 48 | * @throws \Aimeos\MW\Filesystem\Exception If an no configuration for that name is found |
| 49 | 49 | */ |
| 50 | - public function get( $name ) |
|
| 50 | + public function get($name) |
|
| 51 | 51 | { |
| 52 | - $key = $this->getConfig( $name ); |
|
| 52 | + $key = $this->getConfig($name); |
|
| 53 | 53 | |
| 54 | - if( is_string( $key ) ) |
|
| 54 | + if (is_string($key)) |
|
| 55 | 55 | { |
| 56 | - if( !isset( $this->objects[$key] ) ) { |
|
| 57 | - $this->objects[$key] = new \Aimeos\MW\Filesystem\Laravel( $this->fsm->disk( $key ), $this->tempdir ); |
|
| 56 | + if (!isset($this->objects[$key])) { |
|
| 57 | + $this->objects[$key] = new \Aimeos\MW\Filesystem\Laravel($this->fsm->disk($key), $this->tempdir); |
|
| 58 | 58 | } |
| 59 | 59 | |
| 60 | 60 | return $this->objects[$key]; |
| 61 | 61 | } |
| 62 | 62 | |
| 63 | - return parent::get( $name ); |
|
| 63 | + return parent::get($name); |
|
| 64 | 64 | } |
| 65 | 65 | } |
@@ -12,50 +12,50 @@ |
||
| 12 | 12 | |
| 13 | 13 | protected function setUp() |
| 14 | 14 | { |
| 15 | - if( !class_exists( '\Illuminate\Filesystem\FilesystemManager' ) ) { |
|
| 16 | - $this->markTestSkipped( 'Install the Laravel framework first' ); |
|
| 15 | + if (!class_exists('\Illuminate\Filesystem\FilesystemManager')) { |
|
| 16 | + $this->markTestSkipped('Install the Laravel framework first'); |
|
| 17 | 17 | } |
| 18 | 18 | |
| 19 | - $this->storage = $this->getMockBuilder( '\Illuminate\Filesystem\FilesystemManager' ) |
|
| 20 | - ->setMethods( array( 'get' ) ) |
|
| 19 | + $this->storage = $this->getMockBuilder('\Illuminate\Filesystem\FilesystemManager') |
|
| 20 | + ->setMethods(array('get')) |
|
| 21 | 21 | ->disableOriginalConstructor() |
| 22 | 22 | ->getMock(); |
| 23 | 23 | |
| 24 | - $this->config = new \Aimeos\MW\Config\Decorator\Memory( new \Aimeos\MW\Config\PHPArray( array(), array() ) ); |
|
| 25 | - $this->object = new \Aimeos\MW\Filesystem\Manager\Laravel( $this->storage, $this->config, sys_get_temp_dir() ); |
|
| 24 | + $this->config = new \Aimeos\MW\Config\Decorator\Memory(new \Aimeos\MW\Config\PHPArray(array(), array())); |
|
| 25 | + $this->object = new \Aimeos\MW\Filesystem\Manager\Laravel($this->storage, $this->config, sys_get_temp_dir()); |
|
| 26 | 26 | } |
| 27 | 27 | |
| 28 | 28 | |
| 29 | 29 | protected function tearDown() |
| 30 | 30 | { |
| 31 | - unset( $this->config, $this->object, $this->storage ); |
|
| 31 | + unset($this->config, $this->object, $this->storage); |
|
| 32 | 32 | } |
| 33 | 33 | |
| 34 | 34 | |
| 35 | 35 | public function testGet() |
| 36 | 36 | { |
| 37 | - $fs = $this->getMockBuilder( 'Illuminate\Contracts\Filesystem\Filesystem' ) |
|
| 37 | + $fs = $this->getMockBuilder('Illuminate\Contracts\Filesystem\Filesystem') |
|
| 38 | 38 | ->disableOriginalConstructor() |
| 39 | 39 | ->getMock(); |
| 40 | 40 | |
| 41 | - $this->storage->expects( $this->once() )->method( 'get' ) |
|
| 42 | - ->will( $this->returnValue( $fs ) ); |
|
| 41 | + $this->storage->expects($this->once())->method('get') |
|
| 42 | + ->will($this->returnValue($fs)); |
|
| 43 | 43 | |
| 44 | - $this->config->set( 'resource/fs-media', 'local' ); |
|
| 45 | - $this->assertInstanceof( 'Aimeos\MW\Filesystem\Iface', $this->object->get( 'fs-media' ) ); |
|
| 44 | + $this->config->set('resource/fs-media', 'local'); |
|
| 45 | + $this->assertInstanceof('Aimeos\MW\Filesystem\Iface', $this->object->get('fs-media')); |
|
| 46 | 46 | } |
| 47 | 47 | |
| 48 | 48 | |
| 49 | 49 | public function testGetFallback() |
| 50 | 50 | { |
| 51 | - $this->config->set( 'resource/fs', array( 'adapter' => 'Standard', 'basedir' => __DIR__ ) ); |
|
| 52 | - $this->assertInstanceof( 'Aimeos\MW\Filesystem\Iface', $this->object->get( 'fs-media' ) ); |
|
| 51 | + $this->config->set('resource/fs', array('adapter' => 'Standard', 'basedir' => __DIR__)); |
|
| 52 | + $this->assertInstanceof('Aimeos\MW\Filesystem\Iface', $this->object->get('fs-media')); |
|
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | |
| 56 | 56 | public function testGetException() |
| 57 | 57 | { |
| 58 | - $this->setExpectedException( 'Aimeos\MW\Filesystem\Exception' ); |
|
| 59 | - $this->object->get( 'fs-media' ); |
|
| 58 | + $this->setExpectedException('Aimeos\MW\Filesystem\Exception'); |
|
| 59 | + $this->object->get('fs-media'); |
|
| 60 | 60 | } |
| 61 | 61 | } |