@@ -104,9 +104,12 @@ |
||
104 | 104 | */ |
105 | 105 | public function scan( $path = null ) |
106 | 106 | { |
107 | - try { |
|
107 | + try |
|
108 | + { |
|
108 | 109 | return new \DirectoryIterator( $this->resolve( $path ) ); |
109 | - } catch( \Exception $e ) { |
|
110 | + } |
|
111 | + catch( \Exception $e ) |
|
112 | + { |
|
110 | 113 | throw new Exception( $e->getMessage(), 0, $e ); |
111 | 114 | } |
112 | 115 | } |
@@ -189,12 +189,10 @@ |
||
189 | 189 | } |
190 | 190 | |
191 | 191 | return \Aimeos\MW\DB\Statement\Base::PARAM_STR; |
192 | - } |
|
193 | - else if( strpos( $item, '.' ) !== false ) |
|
192 | + } else if( strpos( $item, '.' ) !== false ) |
|
194 | 193 | { |
195 | 194 | return \Aimeos\MW\DB\Statement\Base::PARAM_FLOAT; |
196 | - } |
|
197 | - else if( ctype_digit( $item ) !== false ) |
|
195 | + } else if( ctype_digit( $item ) !== false ) |
|
198 | 196 | { |
199 | 197 | return \Aimeos\MW\DB\Statement\Base::PARAM_INT; |
200 | 198 | } |
@@ -52,12 +52,12 @@ discard block |
||
52 | 52 | { |
53 | 53 | $name = trim( $name, '/' ); |
54 | 54 | |
55 | - if( isset( $this->negCache[ $name ] ) ) { |
|
55 | + if( isset( $this->negCache[$name] ) ) { |
|
56 | 56 | return $default; |
57 | 57 | } |
58 | 58 | |
59 | 59 | if( array_key_exists( $name, $this->cache ) ) { |
60 | - return $this->cache[ $name ]; |
|
60 | + return $this->cache[$name]; |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | if( ( $value = $this->getValueFromArray( $this->config, explode( '/', $name ) ) ) === null ) { |
@@ -66,11 +66,11 @@ discard block |
||
66 | 66 | |
67 | 67 | if( $value === null ) |
68 | 68 | { |
69 | - $this->negCache[ $name ] = true; |
|
69 | + $this->negCache[$name] = true; |
|
70 | 70 | return $default; |
71 | 71 | } |
72 | 72 | |
73 | - $this->cache[ $name ] = $value; |
|
73 | + $this->cache[$name] = $value; |
|
74 | 74 | return $value; |
75 | 75 | } |
76 | 76 | |
@@ -87,15 +87,15 @@ discard block |
||
87 | 87 | |
88 | 88 | if( $value !== null ) |
89 | 89 | { |
90 | - $this->cache[ $name ] = $value; |
|
90 | + $this->cache[$name] = $value; |
|
91 | 91 | |
92 | - if( isset( $this->negCache[ $name ] ) ) { |
|
93 | - unset( $this->negCache[ $name ] ); |
|
92 | + if( isset( $this->negCache[$name] ) ) { |
|
93 | + unset( $this->negCache[$name] ); |
|
94 | 94 | } |
95 | 95 | } |
96 | 96 | else |
97 | 97 | { |
98 | - $this->negCache[ $name ] = true; |
|
98 | + $this->negCache[$name] = true; |
|
99 | 99 | } |
100 | 100 | |
101 | 101 | // don't store local configuration |
@@ -92,8 +92,7 @@ |
||
92 | 92 | if( isset( $this->negCache[ $name ] ) ) { |
93 | 93 | unset( $this->negCache[ $name ] ); |
94 | 94 | } |
95 | - } |
|
96 | - else |
|
95 | + } else |
|
97 | 96 | { |
98 | 97 | $this->negCache[ $name ] = true; |
99 | 98 | } |
@@ -60,8 +60,7 @@ |
||
60 | 60 | { |
61 | 61 | $this->execute( $this->sql ); |
62 | 62 | $this->status( 'done' ); |
63 | - } |
|
64 | - else |
|
63 | + } else |
|
65 | 64 | { |
66 | 65 | $this->status( 'OK' ); |
67 | 66 | } |
@@ -62,8 +62,7 @@ |
||
62 | 62 | { |
63 | 63 | $this->executeList( $stmts ); |
64 | 64 | $this->status( 'done' ); |
65 | - } |
|
66 | - else |
|
65 | + } else |
|
67 | 66 | { |
68 | 67 | $this->status( 'OK' ); |
69 | 68 | } |
@@ -52,8 +52,7 @@ |
||
52 | 52 | { |
53 | 53 | $this->execute( $this->stmt, 'db-product' ); |
54 | 54 | $this->status( 'done' ); |
55 | - } |
|
56 | - else |
|
55 | + } else |
|
57 | 56 | { |
58 | 57 | $this->status( 'OK' ); |
59 | 58 | } |
@@ -81,8 +81,7 @@ |
||
81 | 81 | } else { |
82 | 82 | $this->status( 'OK' ); |
83 | 83 | } |
84 | - } |
|
85 | - else |
|
84 | + } else |
|
86 | 85 | { |
87 | 86 | $this->status( 'OK' ); |
88 | 87 | } |
@@ -66,7 +66,9 @@ discard block |
||
66 | 66 | $this->removeItems( $item->getId(), 'catalog/lists', 'catalog', 'text' ); |
67 | 67 | $this->removeListItems( $item->getId(), 'catalog/lists', 'product' ); |
68 | 68 | } |
69 | - catch( \Exception $e ) {; } // If no root node was already inserted into the database |
|
69 | + catch( \Exception $e ) |
|
70 | + { |
|
71 | +; } // If no root node was already inserted into the database |
|
70 | 72 | |
71 | 73 | |
72 | 74 | if( $value === '1' ) |
@@ -103,8 +105,7 @@ discard block |
||
103 | 105 | } |
104 | 106 | |
105 | 107 | $this->status( 'added' ); |
106 | - } |
|
107 | - else |
|
108 | + } else |
|
108 | 109 | { |
109 | 110 | $this->status( 'removed' ); |
110 | 111 | } |
@@ -89,8 +89,7 @@ |
||
89 | 89 | } |
90 | 90 | |
91 | 91 | $this->status( 'added' ); |
92 | - } |
|
93 | - else |
|
92 | + } else |
|
94 | 93 | { |
95 | 94 | $this->status( 'removed' ); |
96 | 95 | } |