@@ -21,19 +21,19 @@ |
||
| 21 | 21 | * |
| 22 | 22 | * @link http://php.net/manual/class.seekableiterator.php |
| 23 | 23 | */ |
| 24 | -trait SeekableIteratorTrait{ |
|
| 24 | +trait SeekableIteratorTrait { |
|
| 25 | 25 | use IteratorTrait; |
| 26 | 26 | |
| 27 | 27 | /** |
| 28 | 28 | * @link http://php.net/manual/seekableiterator.seek.php |
| 29 | 29 | * @inheritdoc |
| 30 | 30 | */ |
| 31 | - public function seek($pos){ |
|
| 31 | + public function seek($pos) { |
|
| 32 | 32 | $this->rewind(); |
| 33 | 33 | |
| 34 | - for( ; $this->offset < $pos; ){ |
|
| 34 | + for (; $this->offset < $pos;) { |
|
| 35 | 35 | |
| 36 | - if(!next($this->array)) { |
|
| 36 | + if (!next($this->array)) { |
|
| 37 | 37 | throw new OutOfBoundsException('invalid seek position: '.$pos); |
| 38 | 38 | } |
| 39 | 39 | |
@@ -17,16 +17,16 @@ discard block |
||
| 17 | 17 | /** |
| 18 | 18 | * a generic container with magic getter and setter |
| 19 | 19 | */ |
| 20 | -trait Container{ |
|
| 20 | +trait Container { |
|
| 21 | 21 | |
| 22 | 22 | /** |
| 23 | 23 | * @param array $properties |
| 24 | 24 | */ |
| 25 | - public function __construct(array $properties = null){ |
|
| 25 | + public function __construct(array $properties = null) { |
|
| 26 | 26 | |
| 27 | - if(!empty($properties)){ |
|
| 27 | + if (!empty($properties)) { |
|
| 28 | 28 | |
| 29 | - foreach($properties as $key => $value){ |
|
| 29 | + foreach ($properties as $key => $value) { |
|
| 30 | 30 | $this->__set($key, $value); |
| 31 | 31 | } |
| 32 | 32 | |
@@ -39,9 +39,9 @@ discard block |
||
| 39 | 39 | * |
| 40 | 40 | * @return mixed |
| 41 | 41 | */ |
| 42 | - public function __get(string $property){ |
|
| 42 | + public function __get(string $property) { |
|
| 43 | 43 | |
| 44 | - if(property_exists($this, $property) && !(new ReflectionProperty($this, $property))->isPrivate()){ |
|
| 44 | + if (property_exists($this, $property) && !(new ReflectionProperty($this, $property))->isPrivate()) { |
|
| 45 | 45 | return $this->{$property}; |
| 46 | 46 | } |
| 47 | 47 | |
@@ -54,9 +54,9 @@ discard block |
||
| 54 | 54 | * |
| 55 | 55 | * @return void |
| 56 | 56 | */ |
| 57 | - public function __set(string $property, $value){ |
|
| 57 | + public function __set(string $property, $value) { |
|
| 58 | 58 | |
| 59 | - if(property_exists($this, $property) && !(new ReflectionProperty($this, $property))->isPrivate()){ |
|
| 59 | + if (property_exists($this, $property) && !(new ReflectionProperty($this, $property))->isPrivate()) { |
|
| 60 | 60 | $this->{$property} = $value; |
| 61 | 61 | } |
| 62 | 62 | |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | public function __toArray():array { |
| 69 | 69 | $data = []; |
| 70 | 70 | |
| 71 | - foreach($this as $key => $value){ |
|
| 71 | + foreach ($this as $key => $value) { |
|
| 72 | 72 | $data[$key] = $value; |
| 73 | 73 | } |
| 74 | 74 | |
@@ -19,7 +19,7 @@ discard block |
||
| 19 | 19 | |
| 20 | 20 | /** |
| 21 | 21 | */ |
| 22 | -class ByteArrayDispenser{ |
|
| 22 | +class ByteArrayDispenser { |
|
| 23 | 23 | |
| 24 | 24 | /** |
| 25 | 25 | * @var string |
@@ -43,7 +43,7 @@ discard block |
||
| 43 | 43 | */ |
| 44 | 44 | public function fromIntSize(int $size):ByteArray{ |
| 45 | 45 | |
| 46 | - if(!$this->isAllowedInt($size)){ |
|
| 46 | + if (!$this->isAllowedInt($size)) { |
|
| 47 | 47 | throw new TraitException('invalid size'); |
| 48 | 48 | } |
| 49 | 49 | |
@@ -59,18 +59,18 @@ discard block |
||
| 59 | 59 | */ |
| 60 | 60 | public function fromArray($array, $save_indexes = null):ByteArray{ // @todo \Traversable, $target, allow variable arrays, iterators etc |
| 61 | 61 | |
| 62 | - try{ |
|
| 62 | + try { |
|
| 63 | 63 | $out = $this->fromIntSize(count($array)); |
| 64 | 64 | |
| 65 | 65 | $array = ($save_indexes !== null ? $save_indexes : true) ? $array : array_values($array); |
| 66 | 66 | |
| 67 | - foreach($array as $k => $v){ |
|
| 67 | + foreach ($array as $k => $v) { |
|
| 68 | 68 | $out[$k] = $v; |
| 69 | 69 | } |
| 70 | 70 | |
| 71 | 71 | return $out; |
| 72 | 72 | } |
| 73 | - catch(Exception $e){ |
|
| 73 | + catch (Exception $e) { |
|
| 74 | 74 | throw new TraitException($e->getMessage()); |
| 75 | 75 | } |
| 76 | 76 | |
@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | */ |
| 86 | 86 | public function fromRange(int $start, int $len):ByteArray{ |
| 87 | 87 | |
| 88 | - if(!$this->isAllowedInt($start) || $start < 0){ |
|
| 88 | + if (!$this->isAllowedInt($start) || $start < 0) { |
|
| 89 | 89 | throw new TraitException('invalid start'); |
| 90 | 90 | } |
| 91 | 91 | |
@@ -121,7 +121,7 @@ discard block |
||
| 121 | 121 | public function fromHex(string $hex):ByteArray{ |
| 122 | 122 | $hex = preg_replace('/[\s\r\n\t ]/', '', $hex); |
| 123 | 123 | |
| 124 | - if(!$this->isAllowedHex($hex)){ |
|
| 124 | + if (!$this->isAllowedHex($hex)) { |
|
| 125 | 125 | throw new TraitException('invalid hex string'); |
| 126 | 126 | } |
| 127 | 127 | |
@@ -148,7 +148,7 @@ discard block |
||
| 148 | 148 | public function fromJSON(string $json):ByteArray{ |
| 149 | 149 | $json = trim($json); |
| 150 | 150 | |
| 151 | - if(!$this->isAllowedJSON($json)){ |
|
| 151 | + if (!$this->isAllowedJSON($json)) { |
|
| 152 | 152 | throw new TraitException('invalid JSON array'); |
| 153 | 153 | } |
| 154 | 154 | |
@@ -175,7 +175,7 @@ discard block |
||
| 175 | 175 | public function fromBase64(string $base64):ByteArray{ |
| 176 | 176 | $base64 = trim($base64); |
| 177 | 177 | |
| 178 | - if(!$this->isAllowedBase64($base64)){ |
|
| 178 | + if (!$this->isAllowedBase64($base64)) { |
|
| 179 | 179 | throw new TraitException('invalid base64 string'); |
| 180 | 180 | } |
| 181 | 181 | |
@@ -210,19 +210,19 @@ discard block |
||
| 210 | 210 | */ |
| 211 | 211 | public function guessFrom($data):ByteArray{ |
| 212 | 212 | |
| 213 | - if($data instanceof Traversable){ |
|
| 213 | + if ($data instanceof Traversable) { |
|
| 214 | 214 | return $this->fromArray(iterator_to_array($data)); |
| 215 | 215 | } |
| 216 | 216 | |
| 217 | - if(is_array($data)){ |
|
| 217 | + if (is_array($data)) { |
|
| 218 | 218 | return $this->fromArray($data); |
| 219 | 219 | } |
| 220 | 220 | |
| 221 | - if(is_string($data)){ |
|
| 221 | + if (is_string($data)) { |
|
| 222 | 222 | |
| 223 | - foreach(['Hex', 'Bin', 'JSON', 'Base64'] as $type){ |
|
| 223 | + foreach (['Hex', 'Bin', 'JSON', 'Base64'] as $type) { |
|
| 224 | 224 | |
| 225 | - if($this->{'isAllowed'.$type}($data)){ |
|
| 225 | + if ($this->{'isAllowed'.$type}($data)) { |
|
| 226 | 226 | return $this->{'from'.$type}($data); |
| 227 | 227 | } |
| 228 | 228 | |
@@ -69,8 +69,7 @@ |
||
| 69 | 69 | } |
| 70 | 70 | |
| 71 | 71 | return $out; |
| 72 | - } |
|
| 73 | - catch(Exception $e){ |
|
| 72 | + } catch(Exception $e){ |
|
| 74 | 73 | throw new TraitException($e->getMessage()); |
| 75 | 74 | } |
| 76 | 75 | |
@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | /** |
| 18 | 18 | * @extends \SplFixedArray |
| 19 | 19 | */ |
| 20 | -class ByteArray extends SplFixedArray{ |
|
| 20 | +class ByteArray extends SplFixedArray { |
|
| 21 | 21 | |
| 22 | 22 | /** |
| 23 | 23 | * @return string |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | * @return string |
| 31 | 31 | */ |
| 32 | 32 | public function toHex():string{ |
| 33 | - return $this->map(function($v){ |
|
| 33 | + return $this->map(function($v) { |
|
| 34 | 34 | return str_pad(dechex($v), '2', '0', STR_PAD_LEFT); |
| 35 | 35 | }); |
| 36 | 36 | } |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | * @return string |
| 54 | 54 | */ |
| 55 | 55 | public function toBin():string{ |
| 56 | - return $this->map(function($v){ |
|
| 56 | + return $this->map(function($v) { |
|
| 57 | 57 | return str_pad(decbin($v), '8', '0', STR_PAD_LEFT); |
| 58 | 58 | }); |
| 59 | 59 | } |
@@ -82,11 +82,11 @@ discard block |
||
| 82 | 82 | |
| 83 | 83 | $diff = $offset + $length; |
| 84 | 84 | |
| 85 | - if($diff > $this->count()){ |
|
| 85 | + if ($diff > $this->count()) { |
|
| 86 | 86 | $this->setSize($diff); |
| 87 | 87 | } |
| 88 | 88 | |
| 89 | - for($i = 0; $i < $length; $i++){ |
|
| 89 | + for ($i = 0; $i < $length; $i++) { |
|
| 90 | 90 | $this[$i + $offset] = $src[$i + $srcOffset]; |
| 91 | 91 | } |
| 92 | 92 | |
@@ -101,9 +101,9 @@ discard block |
||
| 101 | 101 | */ |
| 102 | 102 | public function slice(int $offset, int $length = null):ByteArray{ |
| 103 | 103 | /** @var \chillerlan\Traits\ArrayHelpers\ByteArray $slice */ |
| 104 | - $slice = (new ReflectionClass($this))->newInstanceArgs([$length ?? $this->count() - $offset]); |
|
| 104 | + $slice = (new ReflectionClass($this))->newInstanceArgs([$length ?? $this->count() - $offset]); |
|
| 105 | 105 | |
| 106 | - foreach($slice as $i => $_){ |
|
| 106 | + foreach ($slice as $i => $_) { |
|
| 107 | 107 | $slice[$i] = $this[$offset + $i]; |
| 108 | 108 | } |
| 109 | 109 | |
@@ -117,13 +117,13 @@ discard block |
||
| 117 | 117 | */ |
| 118 | 118 | public function equal(SplFixedArray $array):bool{ |
| 119 | 119 | |
| 120 | - if($this->count() !== $array->count()){ |
|
| 120 | + if ($this->count() !== $array->count()) { |
|
| 121 | 121 | return false; // @todo: throw Exception? |
| 122 | 122 | } |
| 123 | 123 | |
| 124 | 124 | $diff = 0; |
| 125 | 125 | |
| 126 | - foreach($this as $k => $v){ |
|
| 126 | + foreach ($this as $k => $v) { |
|
| 127 | 127 | $diff |= $v ^ $array[$k]; |
| 128 | 128 | } |
| 129 | 129 | |