@@ -112,9 +112,12 @@ |
||
| 112 | 112 | } |
| 113 | 113 | } |
| 114 | 114 | |
| 115 | - try { |
|
| 115 | + try |
|
| 116 | + { |
|
| 116 | 117 | $this->image->resizeImage( $width, $height, \Imagick::FILTER_CUBIC, 0.8 ); |
| 117 | - } catch( \Exception $e ) { |
|
| 118 | + } |
|
| 119 | + catch( \Exception $e ) |
|
| 120 | + { |
|
| 118 | 121 | throw new \Aimeos\MW\Media\Exception( $e->getMessage() ); |
| 119 | 122 | } |
| 120 | 123 | |
@@ -65,12 +65,12 @@ discard block |
||
| 65 | 65 | { |
| 66 | 66 | if( ctype_alnum( $name ) === false ) |
| 67 | 67 | { |
| 68 | - $classname = is_string( $name ) ? '\\Aimeos\\MW\\View\\Helper\\' . $name : '<not a string>'; |
|
| 68 | + $classname = is_string( $name ) ? '\\Aimeos\\MW\\View\\Helper\\'.$name : '<not a string>'; |
|
| 69 | 69 | throw new \Aimeos\MW\View\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) ); |
| 70 | 70 | } |
| 71 | 71 | |
| 72 | 72 | $iface = '\\Aimeos\\MW\\View\\Helper\\Iface'; |
| 73 | - $classname = '\\Aimeos\\MW\\View\\Helper\\' . ucfirst( $name ) . '\\Standard'; |
|
| 73 | + $classname = '\\Aimeos\\MW\\View\\Helper\\'.ucfirst( $name ).'\\Standard'; |
|
| 74 | 74 | |
| 75 | 75 | if( class_exists( $classname ) === false ) { |
| 76 | 76 | throw new \Aimeos\MW\View\Exception( sprintf( 'Class "%1$s" not available', $classname ) ); |
@@ -221,7 +221,7 @@ discard block |
||
| 221 | 221 | |
| 222 | 222 | foreach( $this->engines as $fileext => $engine ) |
| 223 | 223 | { |
| 224 | - if( substr_compare( $filepath, $fileext, -strlen( $fileext ) ) ===0 ) { |
|
| 224 | + if( substr_compare( $filepath, $fileext, -strlen( $fileext ) ) === 0 ) { |
|
| 225 | 225 | return $engine->render( $this, $filepath, $this->values ); |
| 226 | 226 | } |
| 227 | 227 | } |
@@ -273,7 +273,7 @@ discard block |
||
| 273 | 273 | { |
| 274 | 274 | foreach( $relPaths as $relPath ) |
| 275 | 275 | { |
| 276 | - $absPath = $path . $ds . $relPath . $ds . $file; |
|
| 276 | + $absPath = $path.$ds.$relPath.$ds.$file; |
|
| 277 | 277 | if( $ds !== '/' ) { |
| 278 | 278 | $absPath = str_replace( '/', $ds, $absPath ); |
| 279 | 279 | } |
@@ -54,7 +54,7 @@ |
||
| 54 | 54 | public function transform( $url ) |
| 55 | 55 | { |
| 56 | 56 | if( strncmp( $url, 'http', 4 ) !== 0 && strncmp( $url, 'data:', 5 ) !== 0 ) { |
| 57 | - $url = $this->baseurl . ( $url && $url[0] === '/' ? $url : '/' . $url ); |
|
| 57 | + $url = $this->baseurl.( $url && $url[0] === '/' ? $url : '/'.$url ); |
|
| 58 | 58 | } |
| 59 | 59 | |
| 60 | 60 | return $this->enc->attr( $url ); |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | { |
| 48 | 48 | try { |
| 49 | 49 | return $this->statement->rowCount(); |
| 50 | - } catch ( \Doctrine\DBAL\DBALException $e ) { |
|
| 50 | + } catch( \Doctrine\DBAL\DBALException $e ) { |
|
| 51 | 51 | throw new \Aimeos\MW\DB\Exception( $e->getMessage(), $e->getCode(), join( ', ', $this->statement->errorInfo() ) ); |
| 52 | 52 | } |
| 53 | 53 | } |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | { |
| 65 | 65 | try { |
| 66 | 66 | return $this->statement->fetch( $this->style[$style] ); |
| 67 | - } catch ( \Doctrine\DBAL\DBALException $e ) { |
|
| 67 | + } catch( \Doctrine\DBAL\DBALException $e ) { |
|
| 68 | 68 | throw new \Aimeos\MW\DB\Exception( $e->getMessage(), $e->getCode(), join( ', ', $this->statement->errorInfo() ) ); |
| 69 | 69 | } |
| 70 | 70 | } |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | { |
| 80 | 80 | try { |
| 81 | 81 | $this->statement->closeCursor(); |
| 82 | - } catch ( \Doctrine\DBAL\DBALException $e ) { |
|
| 82 | + } catch( \Doctrine\DBAL\DBALException $e ) { |
|
| 83 | 83 | throw new \Aimeos\MW\DB\Exception( $e->getMessage(), $e->getCode(), join( ', ', $this->statement->errorInfo() ) ); |
| 84 | 84 | } |
| 85 | 85 | } |
@@ -45,9 +45,12 @@ discard block |
||
| 45 | 45 | */ |
| 46 | 46 | public function affectedRows() |
| 47 | 47 | { |
| 48 | - try { |
|
| 48 | + try |
|
| 49 | + { |
|
| 49 | 50 | return $this->statement->rowCount(); |
| 50 | - } catch ( \Doctrine\DBAL\DBALException $e ) { |
|
| 51 | + } |
|
| 52 | + catch ( \Doctrine\DBAL\DBALException $e ) |
|
| 53 | + { |
|
| 51 | 54 | throw new \Aimeos\MW\DB\Exception( $e->getMessage(), $e->getCode(), join( ', ', $this->statement->errorInfo() ) ); |
| 52 | 55 | } |
| 53 | 56 | } |
@@ -62,9 +65,12 @@ discard block |
||
| 62 | 65 | */ |
| 63 | 66 | public function fetch( $style = \Aimeos\MW\DB\Result\Base::FETCH_ASSOC ) |
| 64 | 67 | { |
| 65 | - try { |
|
| 68 | + try |
|
| 69 | + { |
|
| 66 | 70 | return $this->statement->fetch( $this->style[$style] ); |
| 67 | - } catch ( \Doctrine\DBAL\DBALException $e ) { |
|
| 71 | + } |
|
| 72 | + catch ( \Doctrine\DBAL\DBALException $e ) |
|
| 73 | + { |
|
| 68 | 74 | throw new \Aimeos\MW\DB\Exception( $e->getMessage(), $e->getCode(), join( ', ', $this->statement->errorInfo() ) ); |
| 69 | 75 | } |
| 70 | 76 | } |
@@ -77,9 +83,12 @@ discard block |
||
| 77 | 83 | */ |
| 78 | 84 | public function finish() |
| 79 | 85 | { |
| 80 | - try { |
|
| 86 | + try |
|
| 87 | + { |
|
| 81 | 88 | $this->statement->closeCursor(); |
| 82 | - } catch ( \Doctrine\DBAL\DBALException $e ) { |
|
| 89 | + } |
|
| 90 | + catch ( \Doctrine\DBAL\DBALException $e ) |
|
| 91 | + { |
|
| 83 | 92 | throw new \Aimeos\MW\DB\Exception( $e->getMessage(), $e->getCode(), join( ', ', $this->statement->errorInfo() ) ); |
| 84 | 93 | } |
| 85 | 94 | } |
@@ -37,7 +37,7 @@ |
||
| 37 | 37 | * @param string $data Value to escape |
| 38 | 38 | * @return string Escaped string |
| 39 | 39 | */ |
| 40 | - public function escape($data) |
|
| 40 | + public function escape( $data ) |
|
| 41 | 41 | { |
| 42 | 42 | $quoted = $this->getRawObject()->quote( $data ); |
| 43 | 43 | |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | } |
| 93 | 93 | |
| 94 | 94 | if( $this->operator == '!' ) { |
| 95 | - return ' ' . self::$operators[$this->operator] . ' ' . $item->toString( $types, $translations, $plugins ); |
|
| 95 | + return ' '.self::$operators[$this->operator].' '.$item->toString( $types, $translations, $plugins ); |
|
| 96 | 96 | } |
| 97 | 97 | |
| 98 | 98 | $string = $item->toString( $types, $translations, $plugins ); |
@@ -100,11 +100,11 @@ discard block |
||
| 100 | 100 | while( ( $item = next( $this->expressions ) ) !== false ) |
| 101 | 101 | { |
| 102 | 102 | if( ( $itemstr = $item->toString( $types, $translations, $plugins ) ) !== '' ) { |
| 103 | - $string .= ' ' . self::$operators[$this->operator] . ' ' . $itemstr; |
|
| 103 | + $string .= ' '.self::$operators[$this->operator].' '.$itemstr; |
|
| 104 | 104 | } |
| 105 | 105 | } |
| 106 | 106 | |
| 107 | - return '( ' . $string . ' )'; |
|
| 107 | + return '( '.$string.' )'; |
|
| 108 | 108 | } |
| 109 | 109 | |
| 110 | 110 | |
@@ -94,7 +94,7 @@ discard block |
||
| 94 | 94 | $string = $item->toString( $types, $translations, $plugins ); |
| 95 | 95 | |
| 96 | 96 | if( $this->operator == '!' && $string !== '' ) { |
| 97 | - return ' ' . self::$operators[$this->operator] . ' ' . $string; |
|
| 97 | + return ' '.self::$operators[$this->operator].' '.$string; |
|
| 98 | 98 | } |
| 99 | 99 | |
| 100 | 100 | while( ( $item = next( $this->expressions ) ) !== false ) |
@@ -102,14 +102,14 @@ discard block |
||
| 102 | 102 | if( ( $itemstr = $item->toString( $types, $translations, $plugins ) ) !== '' ) |
| 103 | 103 | { |
| 104 | 104 | if( $string !== '' ) { |
| 105 | - $string .= ' ' . self::$operators[$this->operator] . ' ' . $itemstr; |
|
| 105 | + $string .= ' '.self::$operators[$this->operator].' '.$itemstr; |
|
| 106 | 106 | } else { |
| 107 | 107 | $string = $itemstr; |
| 108 | 108 | } |
| 109 | 109 | } |
| 110 | 110 | } |
| 111 | 111 | |
| 112 | - return '( ' . $string . ' )'; |
|
| 112 | + return '( '.$string.' )'; |
|
| 113 | 113 | } |
| 114 | 114 | |
| 115 | 115 | |
@@ -27,7 +27,7 @@ discard block |
||
| 27 | 27 | * @param mixed $default Value returned if requested key isn't found |
| 28 | 28 | * @return mixed Value associated to the requested key |
| 29 | 29 | */ |
| 30 | - public function get($name, $default = null); |
|
| 30 | + public function get( $name, $default = null ); |
|
| 31 | 31 | |
| 32 | 32 | /** |
| 33 | 33 | * Sets the value for the specified key. |
@@ -36,5 +36,5 @@ discard block |
||
| 36 | 36 | * @param mixed $value Value that should be associated with the given path |
| 37 | 37 | * @return null |
| 38 | 38 | */ |
| 39 | - public function set($name, $value); |
|
| 39 | + public function set( $name, $value ); |
|
| 40 | 40 | } |
| 41 | 41 | \ No newline at end of file |
@@ -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 | } |