@@ -234,7 +234,7 @@ |
||
234 | 234 | foreach( $cols as $idx => $col ) |
235 | 235 | { |
236 | 236 | $list[] = 'MIN(' . $col . ') AS "s' . $idx . '"'; |
237 | - $aliases[ $names[$idx] ] = '"s' . $idx . '"'; |
|
237 | + $aliases[$names[$idx]] = '"s' . $idx . '"'; |
|
238 | 238 | } |
239 | 239 | |
240 | 240 | $keys[] = 'orderby'; |
@@ -922,7 +922,7 @@ |
||
922 | 922 | |
923 | 923 | try { |
924 | 924 | $stmt->execute()->finish(); |
925 | - } catch( \Aimeos\MW\DB\Exception $e ) { ; } // Ignore duplicates |
|
925 | + } catch( \Aimeos\MW\DB\Exception $e ) {; } // Ignore duplicates |
|
926 | 926 | } |
927 | 927 | |
928 | 928 |
@@ -745,9 +745,13 @@ |
||
745 | 745 | $stmt->bind( 6, $date ); //mtime |
746 | 746 | $stmt->bind( 7, $siteid, \Aimeos\MW\DB\Statement\Base::PARAM_INT ); |
747 | 747 | |
748 | - try { |
|
748 | + try |
|
749 | + { |
|
749 | 750 | $stmt->execute()->finish(); |
750 | - } catch( \Aimeos\MW\DB\Exception $e ) { ; } // Ignore duplicates |
|
751 | + } |
|
752 | + catch( \Aimeos\MW\DB\Exception $e ) |
|
753 | + { |
|
754 | +; } // Ignore duplicates |
|
751 | 755 | } |
752 | 756 | |
753 | 757 |
@@ -13,15 +13,15 @@ discard block |
||
13 | 13 | error_reporting( -1 ); |
14 | 14 | ini_set( 'display_errors', '1' ); |
15 | 15 | |
16 | -date_default_timezone_set('UTC'); |
|
16 | +date_default_timezone_set( 'UTC' ); |
|
17 | 17 | |
18 | 18 | /* |
19 | 19 | * Set locale settings to reasonable defaults |
20 | 20 | */ |
21 | -setlocale(LC_ALL, 'en_US.UTF-8'); |
|
22 | -setlocale(LC_NUMERIC, 'POSIX'); |
|
23 | -setlocale(LC_CTYPE, 'en_US.UTF-8'); |
|
24 | -setlocale(LC_TIME, 'POSIX'); |
|
21 | +setlocale( LC_ALL, 'en_US.UTF-8' ); |
|
22 | +setlocale( LC_NUMERIC, 'POSIX' ); |
|
23 | +setlocale( LC_CTYPE, 'en_US.UTF-8' ); |
|
24 | +setlocale( LC_TIME, 'POSIX' ); |
|
25 | 25 | |
26 | 26 | |
27 | 27 | /* |
@@ -30,9 +30,9 @@ discard block |
||
30 | 30 | |
31 | 31 | require_once dirname( dirname( dirname( __DIR__ ) ) ) . '/vendor/autoload.php'; |
32 | 32 | |
33 | -$testdir = __DIR__; |
|
34 | -$srcdir = dirname( $testdir ) . DIRECTORY_SEPARATOR . 'src'; |
|
35 | -$libdir = dirname( $testdir ) . DIRECTORY_SEPARATOR . 'lib'; |
|
33 | +$testdir = __DIR__; |
|
34 | +$srcdir = dirname( $testdir ) . DIRECTORY_SEPARATOR . 'src'; |
|
35 | +$libdir = dirname( $testdir ) . DIRECTORY_SEPARATOR . 'lib'; |
|
36 | 36 | |
37 | 37 | $path = array( $testdir, $srcdir, $libdir, get_include_path() ); |
38 | 38 | set_include_path( implode( PATH_SEPARATOR, $path ) ); |
@@ -44,34 +44,34 @@ discard block |
||
44 | 44 | { |
45 | 45 | $this->assertEquals( '127.0.0.1', $this->object->get( 'resource/db/host' ) ); |
46 | 46 | |
47 | - $x = $this->object->get( 'config/manager/default/select', 'defvalue1'); |
|
47 | + $x = $this->object->get( 'config/manager/default/select', 'defvalue1' ); |
|
48 | 48 | $this->assertEquals( 'select11', $x ); |
49 | 49 | |
50 | - $x = $this->object->get( 'config/provider/delivery/sh/select', 'defvalue2'); |
|
50 | + $x = $this->object->get( 'config/provider/delivery/sh/select', 'defvalue2' ); |
|
51 | 51 | $this->assertEquals( 'select2', $x ); |
52 | 52 | |
53 | - $x = $this->object->get( 'subconfig/default/subitem/a/aa', 'defvalue3'); |
|
53 | + $x = $this->object->get( 'subconfig/default/subitem/a/aa', 'defvalue3' ); |
|
54 | 54 | $this->assertEquals( '111', $x ); |
55 | 55 | |
56 | - $x = $this->object->get( 'subconfig/subsubconfig/default/subsubitem/aa/aaa', 'defvalue4'); |
|
56 | + $x = $this->object->get( 'subconfig/subsubconfig/default/subsubitem/aa/aaa', 'defvalue4' ); |
|
57 | 57 | $this->assertEquals( '111', $x ); |
58 | 58 | |
59 | - $x = $this->object->get( 'config/manager/default/select', 'defvalue5'); |
|
59 | + $x = $this->object->get( 'config/manager/default/select', 'defvalue5' ); |
|
60 | 60 | $this->assertEquals( 'select11', $x ); |
61 | 61 | |
62 | - $x = $this->object->get( 'subconfig/subsubconfig/default/subsubitem/aa/aaa', 'defvalue6'); |
|
62 | + $x = $this->object->get( 'subconfig/subsubconfig/default/subsubitem/aa/aaa', 'defvalue6' ); |
|
63 | 63 | $this->assertEquals( '111', $x ); |
64 | 64 | |
65 | - $x = $this->object->get( 'subconfig/default/subitem/a/aa', 'defvalue7'); |
|
65 | + $x = $this->object->get( 'subconfig/default/subitem/a/aa', 'defvalue7' ); |
|
66 | 66 | $this->assertEquals( '111', $x ); |
67 | 67 | |
68 | - $x = $this->object->get( 'subconfig/default/subitem/a/bb', 'defvalue8'); |
|
68 | + $x = $this->object->get( 'subconfig/default/subitem/a/bb', 'defvalue8' ); |
|
69 | 69 | $this->assertEquals( 'defvalue8', $x ); |
70 | 70 | |
71 | - $x = $this->object->get( 'nonsubconfig', 'defvalue9'); |
|
71 | + $x = $this->object->get( 'nonsubconfig', 'defvalue9' ); |
|
72 | 72 | $this->assertEquals( 'defvalue9', $x ); |
73 | 73 | |
74 | - $x = $this->object->get( 'subconfig', 'defvalue10'); |
|
74 | + $x = $this->object->get( 'subconfig', 'defvalue10' ); |
|
75 | 75 | $this->assertInternalType( 'array', $x ); |
76 | 76 | } |
77 | 77 | |
@@ -81,13 +81,13 @@ discard block |
||
81 | 81 | |
82 | 82 | $this->assertEquals( |
83 | 83 | array( |
84 | - 'subitem' => array ( |
|
84 | + 'subitem' => array( |
|
85 | 85 | 'a' => array( |
86 | 86 | 'aa' => '111', |
87 | 87 | ), |
88 | 88 | ), |
89 | 89 | 'subbla' => array( |
90 | - 'b' => array ( |
|
90 | + 'b' => array( |
|
91 | 91 | 'bb' => '22', |
92 | 92 | ), |
93 | 93 | ), |
@@ -109,7 +109,7 @@ |
||
109 | 109 | |
110 | 110 | $lcList = array( |
111 | 111 | 0 => array( |
112 | - 'am', 'ar','bh', 'fil', 'fr', 'gun', 'hi', 'ln', 'lv','mg', 'nso', 'xbr', 'ti', 'wa', 'pt_BR' |
|
112 | + 'am', 'ar', 'bh', 'fil', 'fr', 'gun', 'hi', 'ln', 'lv', 'mg', 'nso', 'xbr', 'ti', 'wa', 'pt_BR' |
|
113 | 113 | ), |
114 | 114 | 1 => array( |
115 | 115 | 'af', 'az', 'bn', 'bg', 'ca', 'da', 'de', 'el', 'en', 'eo', 'es', |
@@ -93,7 +93,7 @@ |
||
93 | 93 | $rows[] = $row; |
94 | 94 | } |
95 | 95 | |
96 | - $actual[ $entry->getName() ] = count( $rows ); |
|
96 | + $actual[$entry->getName()] = count( $rows ); |
|
97 | 97 | } |
98 | 98 | |
99 | 99 | $this->assertEquals( $expected, $actual ); |
@@ -44,7 +44,7 @@ |
||
44 | 44 | throw new \Aimeos\MW\Tree\Exception( sprintf( 'Class "%1$s" not available', $classname ) ); |
45 | 45 | } |
46 | 46 | |
47 | - $manager = new $classname( $config, $resource ); |
|
47 | + $manager = new $classname( $config, $resource ); |
|
48 | 48 | |
49 | 49 | if( !( $manager instanceof $iface ) ) { |
50 | 50 | throw new \Aimeos\MW\Tree\Exception( sprintf( 'Class "%1$s" does not implement interface "%2$s"', $classname, $iface ) ); |
@@ -109,7 +109,7 @@ discard block |
||
109 | 109 | $locale = substr( $locale, 0, -strlen( strrchr( $locale, '_' ) ) ); |
110 | 110 | } |
111 | 111 | |
112 | - switch ( $locale ) |
|
112 | + switch( $locale ) |
|
113 | 113 | { |
114 | 114 | case 'af': |
115 | 115 | case 'az': |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | case 'tk': |
163 | 163 | case 'ur': |
164 | 164 | case 'zu': |
165 | - return ($number == 1) ? 0 : 1; |
|
165 | + return ( $number == 1 ) ? 0 : 1; |
|
166 | 166 | |
167 | 167 | case 'am': |
168 | 168 | case 'bh': |
@@ -176,7 +176,7 @@ discard block |
||
176 | 176 | case 'xbr': |
177 | 177 | case 'ti': |
178 | 178 | case 'wa': |
179 | - return (($number == 0) || ($number == 1)) ? 0 : 1; |
|
179 | + return ( ( $number == 0 ) || ( $number == 1 ) ) ? 0 : 1; |
|
180 | 180 | |
181 | 181 | case 'be': |
182 | 182 | case 'bs': |
@@ -184,41 +184,41 @@ discard block |
||
184 | 184 | case 'ru': |
185 | 185 | case 'sr': |
186 | 186 | case 'uk': |
187 | - return (($number % 10 == 1) && ($number % 100 != 11)) ? 0 : ((($number % 10 >= 2) && ($number % 10 <= 4) && (($number % 100 < 10) || ($number % 100 >= 20))) ? 1 : 2); |
|
187 | + return ( ( $number % 10 == 1 ) && ( $number % 100 != 11 ) ) ? 0 : ( ( ( $number % 10 >= 2 ) && ( $number % 10 <= 4 ) && ( ( $number % 100 < 10 ) || ( $number % 100 >= 20 ) ) ) ? 1 : 2 ); |
|
188 | 188 | |
189 | 189 | case 'cs': |
190 | 190 | case 'sk': |
191 | - return ($number == 1) ? 0 : ((($number >= 2) && ($number <= 4)) ? 1 : 2); |
|
191 | + return ( $number == 1 ) ? 0 : ( ( ( $number >= 2 ) && ( $number <= 4 ) ) ? 1 : 2 ); |
|
192 | 192 | |
193 | 193 | case 'ar': |
194 | - return ($number == 0) ? 0 : (($number == 1) ? 1 : (($number == 2) ? 2 : ((($number >= 3) && ($number <= 10)) ? 3 : ((($number >= 11) && ($number <= 99)) ? 4 : 5)))); |
|
194 | + return ( $number == 0 ) ? 0 : ( ( $number == 1 ) ? 1 : ( ( $number == 2 ) ? 2 : ( ( ( $number >= 3 ) && ( $number <= 10 ) ) ? 3 : ( ( ( $number >= 11 ) && ( $number <= 99 ) ) ? 4 : 5 ) ) ) ); |
|
195 | 195 | |
196 | 196 | case 'cy': |
197 | - return ($number == 1) ? 0 : (($number == 2) ? 1 : ((($number == 8) || ($number == 11)) ? 2 : 3)); |
|
197 | + return ( $number == 1 ) ? 0 : ( ( $number == 2 ) ? 1 : ( ( ( $number == 8 ) || ( $number == 11 ) ) ? 2 : 3 ) ); |
|
198 | 198 | |
199 | 199 | case 'ga': |
200 | - return ($number == 1) ? 0 : (($number == 2) ? 1 : 2); |
|
200 | + return ( $number == 1 ) ? 0 : ( ( $number == 2 ) ? 1 : 2 ); |
|
201 | 201 | |
202 | 202 | case 'lt': |
203 | - return (($number % 10 == 1) && ($number % 100 != 11)) ? 0 : ((($number % 10 >= 2) && (($number % 100 < 10) || ($number % 100 >= 20))) ? 1 : 2); |
|
203 | + return ( ( $number % 10 == 1 ) && ( $number % 100 != 11 ) ) ? 0 : ( ( ( $number % 10 >= 2 ) && ( ( $number % 100 < 10 ) || ( $number % 100 >= 20 ) ) ) ? 1 : 2 ); |
|
204 | 204 | |
205 | 205 | case 'lv': |
206 | - return ($number == 0) ? 0 : ((($number % 10 == 1) && ($number % 100 != 11)) ? 1 : 2); |
|
206 | + return ( $number == 0 ) ? 0 : ( ( ( $number % 10 == 1 ) && ( $number % 100 != 11 ) ) ? 1 : 2 ); |
|
207 | 207 | |
208 | 208 | case 'mk': |
209 | - return ($number % 10 == 1) ? 0 : 1; |
|
209 | + return ( $number % 10 == 1 ) ? 0 : 1; |
|
210 | 210 | |
211 | 211 | case 'mt': |
212 | - return ($number == 1) ? 0 : ((($number == 0) || (($number % 100 > 1) && ($number % 100 < 11))) ? 1 : ((($number % 100 > 10) && ($number % 100 < 20)) ? 2 : 3)); |
|
212 | + return ( $number == 1 ) ? 0 : ( ( ( $number == 0 ) || ( ( $number % 100 > 1 ) && ( $number % 100 < 11 ) ) ) ? 1 : ( ( ( $number % 100 > 10 ) && ( $number % 100 < 20 ) ) ? 2 : 3 ) ); |
|
213 | 213 | |
214 | 214 | case 'pl': |
215 | - return ($number == 1) ? 0 : ((($number % 10 >= 2) && ($number % 10 <= 4) && (($number % 100 < 12) || ($number % 100 > 14))) ? 1 : 2); |
|
215 | + return ( $number == 1 ) ? 0 : ( ( ( $number % 10 >= 2 ) && ( $number % 10 <= 4 ) && ( ( $number % 100 < 12 ) || ( $number % 100 > 14 ) ) ) ? 1 : 2 ); |
|
216 | 216 | |
217 | 217 | case 'ro': |
218 | - return ($number == 1) ? 0 : ((($number == 0) || (($number % 100 > 0) && ($number % 100 < 20))) ? 1 : 2); |
|
218 | + return ( $number == 1 ) ? 0 : ( ( ( $number == 0 ) || ( ( $number % 100 > 0 ) && ( $number % 100 < 20 ) ) ) ? 1 : 2 ); |
|
219 | 219 | |
220 | 220 | case 'sl': |
221 | - return ($number % 100 == 1) ? 0 : (($number % 100 == 2) ? 1 : ((($number % 100 == 3) || ($number % 100 == 4)) ? 2 : 3)); |
|
221 | + return ( $number % 100 == 1 ) ? 0 : ( ( $number % 100 == 2 ) ? 1 : ( ( ( $number % 100 == 3 ) || ( $number % 100 == 4 ) ) ? 2 : 3 ) ); |
|
222 | 222 | |
223 | 223 | default: |
224 | 224 | return 0; |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | return new \Aimeos\MW\Convert\Compose( $list ); |
39 | 39 | } |
40 | 40 | |
41 | - return self::createObject( $keys );; |
|
41 | + return self::createObject( $keys ); ; |
|
42 | 42 | } |
43 | 43 | |
44 | 44 | |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | throw new \Aimeos\MW\Convert\Exception( sprintf( 'Class "%1$s" not available', $classname ) ); |
69 | 69 | } |
70 | 70 | |
71 | - $object = new $classname(); |
|
71 | + $object = new $classname(); |
|
72 | 72 | |
73 | 73 | if( !( $object instanceof $iface ) ) { |
74 | 74 | throw new \Aimeos\MW\Convert\Exception( sprintf( 'Class "%1$s" does not implement interface "%2$s"', $classname, $iface ) ); |