@@ -713,7 +713,7 @@ |
||
713 | 713 | |
714 | 714 | try { |
715 | 715 | $stmt->execute()->finish(); |
716 | - } catch( \Aimeos\MW\DB\Exception $e ) { ; } // Ignore duplicates |
|
716 | + } catch( \Aimeos\MW\DB\Exception $e ) {; } // Ignore duplicates |
|
717 | 717 | } |
718 | 718 | } |
719 | 719 | } |
@@ -670,9 +670,13 @@ |
||
670 | 670 | $stmt->bind( 6, $date ); // mtime |
671 | 671 | $stmt->bind( 7, $siteid, \Aimeos\MW\DB\Statement\Base::PARAM_INT ); |
672 | 672 | |
673 | - try { |
|
673 | + try |
|
674 | + { |
|
674 | 675 | $stmt->execute()->finish(); |
675 | - } catch( \Aimeos\MW\DB\Exception $e ) { ; } // Ignore duplicates |
|
676 | + } |
|
677 | + catch( \Aimeos\MW\DB\Exception $e ) |
|
678 | + { |
|
679 | +; } // Ignore duplicates |
|
676 | 680 | } |
677 | 681 | } |
678 | 682 | } |
@@ -521,7 +521,7 @@ |
||
521 | 521 | |
522 | 522 | try { |
523 | 523 | $stmt->execute()->finish(); |
524 | - } catch( \Aimeos\MW\DB\Exception $e ) { ; } // Ignore duplicates |
|
524 | + } catch( \Aimeos\MW\DB\Exception $e ) {; } // Ignore duplicates |
|
525 | 525 | } |
526 | 526 | } |
527 | 527 |
@@ -472,9 +472,13 @@ |
||
472 | 472 | $stmt->bind( 5, $date ); //mtime |
473 | 473 | $stmt->bind( 6, $siteid, \Aimeos\MW\DB\Statement\Base::PARAM_INT ); |
474 | 474 | |
475 | - try { |
|
475 | + try |
|
476 | + { |
|
476 | 477 | $stmt->execute()->finish(); |
477 | - } catch( \Aimeos\MW\DB\Exception $e ) { ; } // Ignore duplicates |
|
478 | + } |
|
479 | + catch( \Aimeos\MW\DB\Exception $e ) |
|
480 | + { |
|
481 | +; } // Ignore duplicates |
|
478 | 482 | } |
479 | 483 | } |
480 | 484 |
@@ -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 |
@@ -661,7 +661,8 @@ discard block |
||
661 | 661 | isset( $texts[$langId] ) ?: $texts[$langId] = $item->getCode(); |
662 | 662 | $texts[$langId] .= ' ' . $content; |
663 | 663 | |
664 | - switch( $refItem->getType() ) { |
|
664 | + switch( $refItem->getType() ) |
|
665 | + { |
|
665 | 666 | case 'url': |
666 | 667 | $urls[$langId] = $content; break; |
667 | 668 | case 'name': |
@@ -717,9 +718,13 @@ discard block |
||
717 | 718 | $stmt->bind( 6, $date ); //mtime |
718 | 719 | $stmt->bind( 7, $siteid, \Aimeos\MW\DB\Statement\Base::PARAM_INT ); |
719 | 720 | |
720 | - try { |
|
721 | + try |
|
722 | + { |
|
721 | 723 | $stmt->execute()->finish(); |
722 | - } catch( \Aimeos\MW\DB\Exception $e ) { ; } // Ignore duplicates |
|
724 | + } |
|
725 | + catch( \Aimeos\MW\DB\Exception $e ) |
|
726 | + { |
|
727 | +; } // Ignore duplicates |
|
723 | 728 | } |
724 | 729 | |
725 | 730 |
@@ -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 ) ); |