@@ -108,9 +108,12 @@ |
||
108 | 108 | */ |
109 | 109 | public function scan( string $path = null ) : iterable |
110 | 110 | { |
111 | - try { |
|
111 | + try |
|
112 | + { |
|
112 | 113 | return new \DirectoryIterator( $this->resolve( $path ) ); |
113 | - } catch( \Exception $e ) { |
|
114 | + } |
|
115 | + catch( \Exception $e ) |
|
116 | + { |
|
114 | 117 | throw new Exception( $e->getMessage(), 0, $e ); |
115 | 118 | } |
116 | 119 | } |
@@ -60,9 +60,12 @@ |
||
60 | 60 | */ |
61 | 61 | public function execute() : \Aimeos\MW\DB\Result\Iface |
62 | 62 | { |
63 | - try { |
|
63 | + try |
|
64 | + { |
|
64 | 65 | $stmt = $this->exec(); |
65 | - } catch( \PDOException $e ) { |
|
66 | + } |
|
67 | + catch( \PDOException $e ) |
|
68 | + { |
|
66 | 69 | throw new \Aimeos\MW\DB\Exception( $e->getMessage() . ': ' . $this->sql, $e->getCode() ); |
67 | 70 | } |
68 | 71 |
@@ -61,9 +61,12 @@ |
||
61 | 61 | */ |
62 | 62 | public function execute() : \Aimeos\MW\DB\Result\Iface |
63 | 63 | { |
64 | - try { |
|
64 | + try |
|
65 | + { |
|
65 | 66 | $stmt = $this->exec(); |
66 | - } catch( \PDOException $e ) { |
|
67 | + } |
|
68 | + catch( \PDOException $e ) |
|
69 | + { |
|
67 | 70 | throw new \Aimeos\MW\DB\Exception( $e->getMessage() . ': ' . $this->sql, $e->getCode(), $e->errorInfo ); |
68 | 71 | } |
69 | 72 |
@@ -69,9 +69,12 @@ |
||
69 | 69 | */ |
70 | 70 | public function execute() : \Aimeos\MW\DB\Result\Iface |
71 | 71 | { |
72 | - try { |
|
72 | + try |
|
73 | + { |
|
73 | 74 | $result = $this->exec(); |
74 | - } catch( \PDOException $e ) { |
|
75 | + } |
|
76 | + catch( \PDOException $e ) |
|
77 | + { |
|
75 | 78 | throw new \Aimeos\MW\DB\Exception( $e->getMessage() . ': ' . $this->sql, $e->getCode() ); |
76 | 79 | } |
77 | 80 |
@@ -69,9 +69,12 @@ |
||
69 | 69 | */ |
70 | 70 | public function execute() : \Aimeos\MW\DB\Result\Iface |
71 | 71 | { |
72 | - try { |
|
72 | + try |
|
73 | + { |
|
73 | 74 | $result = $this->exec(); |
74 | - } catch( \PDOException $e ) { |
|
75 | + } |
|
76 | + catch( \PDOException $e ) |
|
77 | + { |
|
75 | 78 | throw new \Aimeos\MW\DB\Exception( $e->getMessage() . ': ' . $this->sql, $e->getCode() ); |
76 | 79 | } |
77 | 80 |
@@ -200,8 +200,7 @@ discard block |
||
200 | 200 | foreach( $columns as $name ) { |
201 | 201 | $names .= '"' . $name . '", '; $values .= '?, '; |
202 | 202 | } |
203 | - } |
|
204 | - else |
|
203 | + } else |
|
205 | 204 | { |
206 | 205 | foreach( $columns as $name ) { |
207 | 206 | $names .= '"' . $name . '" = ?, '; |
@@ -454,8 +453,7 @@ discard block |
||
454 | 453 | $e = new \Exception(); |
455 | 454 | $msg['trace'] = $e->getTraceAsString(); |
456 | 455 | $level = \Aimeos\MW\Logger\Base::NOTICE; |
457 | - } |
|
458 | - else |
|
456 | + } else |
|
459 | 457 | { |
460 | 458 | $level = \Aimeos\MW\Logger\Base::DEBUG; |
461 | 459 | } |
@@ -635,11 +633,9 @@ discard block |
||
635 | 633 | |
636 | 634 | if( isset( $attributes[$prefix] ) && $attributes[$prefix] instanceof $iface ) { |
637 | 635 | return $attributes[$prefix]->getInternalDeps(); |
638 | - } |
|
639 | - elseif( isset( $attributes[$name] ) && $attributes[$name] instanceof $iface ) { |
|
636 | + } elseif( isset( $attributes[$name] ) && $attributes[$name] instanceof $iface ) { |
|
640 | 637 | return $attributes[$name]->getInternalDeps(); |
641 | - } |
|
642 | - else if( isset( $attributes['id'] ) && $attributes['id'] instanceof $iface ) { |
|
638 | + } else if( isset( $attributes['id'] ) && $attributes['id'] instanceof $iface ) { |
|
643 | 639 | return $attributes['id']->getInternalDeps(); |
644 | 640 | } |
645 | 641 |
@@ -727,9 +727,12 @@ discard block |
||
727 | 727 | |
728 | 728 | foreach( $sitePath as $siteId ) |
729 | 729 | { |
730 | - try { |
|
730 | + try |
|
731 | + { |
|
731 | 732 | $path = $this->createTreeManager( $siteId )->getPath( $id ); |
732 | - } catch( \Exception $e ) { |
|
733 | + } |
|
734 | + catch( \Exception $e ) |
|
735 | + { |
|
733 | 736 | continue; |
734 | 737 | } |
735 | 738 | |
@@ -764,9 +767,12 @@ discard block |
||
764 | 767 | |
765 | 768 | foreach( $sitePath as $siteId ) |
766 | 769 | { |
767 | - try { |
|
770 | + try |
|
771 | + { |
|
768 | 772 | $node = $this->createTreeManager( $siteId )->getNode( $id, $level, $criteria ); |
769 | - } catch( \Aimeos\MW\Tree\Exception $e ) { |
|
773 | + } |
|
774 | + catch( \Aimeos\MW\Tree\Exception $e ) |
|
775 | + { |
|
770 | 776 | continue; |
771 | 777 | } |
772 | 778 | |
@@ -846,8 +852,7 @@ discard block |
||
846 | 852 | if( $child->getParentId() !== $item->getParentId() ) { |
847 | 853 | $this->moveItem( $child->getId(), $item->getParentId(), $child->getParentId() ); |
848 | 854 | } |
849 | - } |
|
850 | - else |
|
855 | + } else |
|
851 | 856 | { |
852 | 857 | $this->insertItem( $child, $item->getId() ); |
853 | 858 | } |
@@ -1005,8 +1010,7 @@ discard block |
||
1005 | 1010 | */ |
1006 | 1011 | $path = 'mshop/catalog/manager/standard/update-usage'; |
1007 | 1012 | $sql = $this->addSqlColumns( array_keys( $columns ), $this->getSqlConfig( $path ), false ); |
1008 | - } |
|
1009 | - else |
|
1013 | + } else |
|
1010 | 1014 | { |
1011 | 1015 | /** mshop/catalog/manager/standard/insert-usage/mysql |
1012 | 1016 | * Updates the config, editor, ctime and mtime value of an inserted record |
@@ -1069,8 +1073,7 @@ discard block |
||
1069 | 1073 | { |
1070 | 1074 | $stmt->bind( $idx++, $siteid ); |
1071 | 1075 | $stmt->bind( $idx++, $id, \Aimeos\MW\DB\Statement\Base::PARAM_INT ); |
1072 | - } |
|
1073 | - else |
|
1076 | + } else |
|
1074 | 1077 | { |
1075 | 1078 | $stmt->bind( $idx++, $date ); // ctime |
1076 | 1079 | $stmt->bind( $idx++, $siteid ); |
@@ -80,8 +80,7 @@ |
||
80 | 80 | $dbm->release( $conn, $rname ); |
81 | 81 | |
82 | 82 | $this->status( 'done' ); |
83 | - } |
|
84 | - else |
|
83 | + } else |
|
85 | 84 | { |
86 | 85 | $this->status( 'OK' ); |
87 | 86 | } |
@@ -250,8 +250,7 @@ |
||
250 | 250 | } |
251 | 251 | |
252 | 252 | $this->status( 'done' ); |
253 | - } |
|
254 | - else |
|
253 | + } else |
|
255 | 254 | { |
256 | 255 | $this->status( 'OK' ); |
257 | 256 | } |