@@ -32,9 +32,12 @@ discard block |
||
32 | 32 | { |
33 | 33 | parent::__construct( $config ); |
34 | 34 | |
35 | - try { |
|
35 | + try |
|
36 | + { |
|
36 | 37 | $this->conn = $this->createConnection(); |
37 | - } catch( \Aimeos\MW\DB\Exception $e ) { |
|
38 | + } |
|
39 | + catch( \Aimeos\MW\DB\Exception $e ) |
|
40 | + { |
|
38 | 41 | throw new \Aimeos\MW\MQueue\Exception( $e->getMessage() ); |
39 | 42 | } |
40 | 43 | } |
@@ -85,8 +88,7 @@ discard block |
||
85 | 88 | { |
86 | 89 | $dsn .= isset( $host ) ? ';host=' . $host : ''; |
87 | 90 | $dsn .= isset( $port ) ? ';port=' . $port : ''; |
88 | - } |
|
89 | - else |
|
91 | + } else |
|
90 | 92 | { |
91 | 93 | $dsn .= ';unix_socket=' . $sock; |
92 | 94 | } |
@@ -80,15 +80,15 @@ |
||
80 | 80 | $sock = $this->getConfig( 'db/socket' ); |
81 | 81 | $dbase = $this->getConfig( 'db/database', 'aimeos' ); |
82 | 82 | |
83 | - $dsn = $adapter . ':dbname=' . $dbase; |
|
83 | + $dsn = $adapter.':dbname='.$dbase; |
|
84 | 84 | if( $sock == null ) |
85 | 85 | { |
86 | - $dsn .= isset( $host ) ? ';host=' . $host : ''; |
|
87 | - $dsn .= isset( $port ) ? ';port=' . $port : ''; |
|
86 | + $dsn .= isset( $host ) ? ';host='.$host : ''; |
|
87 | + $dsn .= isset( $port ) ? ';port='.$port : ''; |
|
88 | 88 | } |
89 | 89 | else |
90 | 90 | { |
91 | - $dsn .= ';unix_socket=' . $sock; |
|
91 | + $dsn .= ';unix_socket='.$sock; |
|
92 | 92 | } |
93 | 93 | |
94 | 94 | $attr = array( |
@@ -60,7 +60,7 @@ |
||
60 | 60 | $this->additional->setEditor( 'core:unittest' ); |
61 | 61 | |
62 | 62 | $ds = DIRECTORY_SEPARATOR; |
63 | - $path = __DIR__ . $ds . 'data' . $ds . 'attribute.php'; |
|
63 | + $path = __DIR__.$ds.'data'.$ds.'attribute.php'; |
|
64 | 64 | |
65 | 65 | if( ( $testdata = include( $path ) ) == false ) { |
66 | 66 | throw new \Aimeos\MShop\Exception( sprintf( 'No file "%1$s" found for attribute domain', $path ) ); |
@@ -67,7 +67,7 @@ |
||
67 | 67 | if( $this->additional->getConfig()->get( 'setup/site' ) === 'unittest' ) |
68 | 68 | { |
69 | 69 | $ds = DIRECTORY_SEPARATOR; |
70 | - $filename = __DIR__ . $ds . 'data' . $ds . 'locale.php'; |
|
70 | + $filename = __DIR__.$ds.'data'.$ds.'locale.php'; |
|
71 | 71 | |
72 | 72 | if( ( $testdata = include( $filename ) ) == false ) { |
73 | 73 | throw new \Aimeos\MW\Setup\Exception( sprintf( 'No data file "%1$s" found', $filename ) ); |
@@ -60,7 +60,7 @@ |
||
60 | 60 | $this->additional->setEditor( 'core:unittest' ); |
61 | 61 | |
62 | 62 | $ds = DIRECTORY_SEPARATOR; |
63 | - $path = __DIR__ . $ds . 'data' . $ds . 'text.php'; |
|
63 | + $path = __DIR__.$ds.'data'.$ds.'text.php'; |
|
64 | 64 | |
65 | 65 | if( ( $testdata = include( $path ) ) == false ) { |
66 | 66 | throw new \Aimeos\MShop\Exception( sprintf( 'No file "%1$s" found for text domain', $path ) ); |
@@ -60,7 +60,7 @@ |
||
60 | 60 | $this->additional->setEditor( 'core:unittest' ); |
61 | 61 | |
62 | 62 | $ds = DIRECTORY_SEPARATOR; |
63 | - $path = __DIR__ . $ds . 'data' . $ds . 'media.php'; |
|
63 | + $path = __DIR__.$ds.'data'.$ds.'media.php'; |
|
64 | 64 | |
65 | 65 | if( ( $testdata = include( $path ) ) == false ) { |
66 | 66 | throw new \Aimeos\MShop\Exception( sprintf( 'No file "%1$s" found for media domain', $path ) ); |
@@ -75,7 +75,7 @@ |
||
75 | 75 | $adminLogManager = \Aimeos\MAdmin\Log\Manager\Factory::createManager( $this->additional, 'Standard' ); |
76 | 76 | |
77 | 77 | $ds = DIRECTORY_SEPARATOR; |
78 | - $path = __DIR__ . $ds . 'data' . $ds . 'log.php'; |
|
78 | + $path = __DIR__.$ds.'data'.$ds.'log.php'; |
|
79 | 79 | |
80 | 80 | if( ( $testdata = include( $path ) ) == false ) { |
81 | 81 | throw new \Aimeos\MShop\Exception( sprintf( 'No file "%1$s" found for log domain', $path ) ); |
@@ -60,7 +60,7 @@ |
||
60 | 60 | $this->additional->setEditor( 'core:unittest' ); |
61 | 61 | |
62 | 62 | $ds = DIRECTORY_SEPARATOR; |
63 | - $path = __DIR__ . $ds . 'data' . $ds . 'catalog.php'; |
|
63 | + $path = __DIR__.$ds.'data'.$ds.'catalog.php'; |
|
64 | 64 | |
65 | 65 | if( ( $testdata = include( $path ) ) == false ) { |
66 | 66 | throw new \Aimeos\MShop\Exception( sprintf( 'No file "%1$s" found for catalog domain', $path ) ); |
@@ -76,7 +76,7 @@ |
||
76 | 76 | $pluginTypeManager = $pluginManager->getSubManager( 'type', 'Standard' ); |
77 | 77 | |
78 | 78 | $ds = DIRECTORY_SEPARATOR; |
79 | - $path = __DIR__ . $ds . 'data' . $ds . 'plugin.php'; |
|
79 | + $path = __DIR__.$ds.'data'.$ds.'plugin.php'; |
|
80 | 80 | |
81 | 81 | if( ( $testdata = include( $path ) ) == false ) { |
82 | 82 | throw new \Aimeos\MShop\Exception( sprintf( 'No file "%1$s" found for plugin domain', $path ) ); |
@@ -61,7 +61,7 @@ |
||
61 | 61 | $this->additional->setEditor( 'core:unittest' ); |
62 | 62 | |
63 | 63 | $ds = DIRECTORY_SEPARATOR; |
64 | - $path = __DIR__ . $ds . 'data' . $ds . 'tag.php'; |
|
64 | + $path = __DIR__.$ds.'data'.$ds.'tag.php'; |
|
65 | 65 | |
66 | 66 | if( ( $testdata = include( $path ) ) == false ) { |
67 | 67 | throw new \Aimeos\MShop\Exception( sprintf( 'No file "%1$s" found for tag domain', $path ) ); |