Skip to content
This repository was archived by the owner on Jan 31, 2020. It is now read-only.

Commit c386fb6

Browse files
weierophinneyweierophinney
committed
Merge branch 'cs/various-things' of https://github.com/Maks3w/zf2 
62 parents f7728a0 + 1494123 + 37a0af1 + 7901b8d + fef7ea4 + ab6aeed + 2b550b3 + 5012c72 + 2fb1f46 + 113db2e + 2ff3e0f + 267ab5a + 32a6070 + 42440a2 + 0b2d816 + 73f546a + 29960fb + 4d39530 + c3109c3 + ecfc771 + 97d3c16 + ec3c516 + 5c0774f + c7c26aa + cc2a971 + a58a318 + 56aa212 + deb83ca + 8c6325a + 06fbdf6 + ec2d4d3 + e3c3d67 + 074157d + 25f5da9 + d867a37 + e2b421c + 995a627 + 5a1a1aa + cf45d64 + 5fe14a9 + 09251bb + 87d3a8a + 811b3ce + e403c40 + fc07622 + f77ecca + ced9ea5 + 5742524 + 921da84 + 15f06c7 + 75cd1c5 + ca5a1b7 + c80879b + 688962d + 10855d8 + 8838d57 + 0fb8b1d + 8642ba6 + 60c28b9 + abff4d2 + b205489 + edf9e1e commit c386fb6

File tree

15 files changed

+69
-67
lines changed

15 files changed

+69
-67
lines changed

‎src/Adapter/AbstractAdapter.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public function setOptions($options)
6666
* @param mixed $value Option value
6767
* @return AbstractAdapter
6868
*/
69-
public function setOption($name, $value)
69+
public function setOption($name, $value)
7070
{
7171
$this->_options[(string) $name] = $value;
7272
return $this;
@@ -77,7 +77,7 @@ public function setOption($name, $value)
7777
*
7878
* @return array
7979
*/
80-
public function getOptions()
80+
public function getOptions()
8181
{
8282
return $this->_options;
8383
}
@@ -89,7 +89,7 @@ public function getOptions()
8989
* @return mixed
9090
* @throws InvalidArgumentException
9191
*/
92-
public function getOption($name)
92+
public function getOption($name)
9393
{
9494
$name = (string) $name;
9595
if (!array_key_exists($name, $this->_options)) {

‎src/Adapter/Amf0.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ class Amf0 extends AbstractAdapter
2222
{
2323
/**
2424
* Serialize a PHP value to AMF0 format
25-
*
26-
* @param mixed $value
27-
* @param array $opts
25+
*
26+
* @param mixed $value
27+
* @param array $opts
2828
* @return string
2929
* @throws RuntimeException
3030
*/
@@ -42,9 +42,9 @@ public function serialize($value, array $opts = array())
4242

4343
/**
4444
* Unserialize an AMF0 value to PHP
45-
*
46-
* @param mixed $value
47-
* @param array $opts
45+
*
46+
* @param mixed $value
47+
* @param array $opts
4848
* @return void
4949
* @throws RuntimeException
5050
*/

‎src/Adapter/Amf3.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ class Amf3 extends AbstractAdapter
2222
{
2323
/**
2424
* Serialize a PHP value to AMF3 format
25-
*
26-
* @param mixed $value
27-
* @param array $opts
25+
*
26+
* @param mixed $value
27+
* @param array $opts
2828
* @return string
2929
* @throws RuntimeException
3030
*/
@@ -42,9 +42,9 @@ public function serialize($value, array $opts = array())
4242

4343
/**
4444
* Deserialize an AMF3 value to PHP
45-
*
46-
* @param mixed $value
47-
* @param array $opts
45+
*
46+
* @param mixed $value
47+
* @param array $opts
4848
* @return string
4949
* @throws RuntimeException
5050
*/

‎src/Adapter/IgBinary.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class IgBinary extends AbstractAdapter
2727

2828
/**
2929
* Constructor
30-
*
30+
*
3131
* @param array|\Traversable $options
3232
* @return void
3333
* @throws ExtensionNotLoadedException If igbinary extension is not present
@@ -47,9 +47,9 @@ public function __construct($options = array())
4747

4848
/**
4949
* Serialize PHP value to igbinary
50-
*
51-
* @param mixed $value
52-
* @param array $opts
50+
*
51+
* @param mixed $value
52+
* @param array $opts
5353
* @return string
5454
* @throws RuntimeException on igbinary error
5555
*/
@@ -65,9 +65,9 @@ public function serialize($value, array $opts = array())
6565

6666
/**
6767
* Deserialize igbinary string to PHP value
68-
*
69-
* @param string|binary $serialized
70-
* @param array $opts
68+
*
69+
* @param string|binary $serialized
70+
* @param array $opts
7171
* @return mixed
7272
* @throws RuntimeException on igbinary error
7373
*/

‎src/Adapter/Json.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ class Json extends AbstractAdapter
3232

3333
/**
3434
* Serialize PHP value to JSON
35-
*
36-
* @param mixed $value
37-
* @param array $opts
35+
*
36+
* @param mixed $value
37+
* @param array $opts
3838
* @return string
3939
* @throws InvalidArgumentException|RuntimeException on JSON encoding exception
4040
*/
@@ -53,9 +53,9 @@ public function serialize($value, array $opts = array())
5353

5454
/**
5555
* Deserialize JSON to PHP value
56-
*
57-
* @param string $json
58-
* @param array $opts
56+
*
57+
* @param string $json
58+
* @param array $opts
5959
* @return mixed
6060
* @throws InvalidArgumentException|RuntimeException
6161
*/

‎src/Adapter/PhpCode.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ class PhpCode extends AbstractAdapter
2121
{
2222
/**
2323
* Serialize PHP using var_export
24-
*
25-
* @param mixed $value
26-
* @param array $opts
24+
*
25+
* @param mixed $value
26+
* @param array $opts
2727
* @return string
2828
*/
2929
public function serialize($value, array $opts = array())
@@ -35,9 +35,9 @@ public function serialize($value, array $opts = array())
3535
* Deserialize PHP string
3636
*
3737
* Warning: this uses eval(), and should likely be avoided.
38-
*
39-
* @param string $code
40-
* @param array $opts
38+
*
39+
* @param string $code
40+
* @param array $opts
4141
* @return mixed
4242
* @throws RuntimeException on eval error
4343
*/

‎src/Adapter/PhpSerialize.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class PhpSerialize extends AbstractAdapter
2626

2727
/**
2828
* Constructor
29-
*
29+
*
3030
* @param array|\Traversable $options
3131
* @return void
3232
*/
@@ -43,9 +43,9 @@ public function __construct($options = array())
4343

4444
/**
4545
* Serialize using serialize()
46-
*
47-
* @param mixed $value
48-
* @param array $opts
46+
*
47+
* @param mixed $value
48+
* @param array $opts
4949
* @return string
5050
* @throws RuntimeException On serialize error
5151
*/
@@ -67,10 +67,10 @@ public function serialize($value, array $opts = array())
6767

6868
/**
6969
* Unserialize
70-
*
70+
*
7171
* @todo Allow integration with unserialize_callback_func
72-
* @param string $serialized
73-
* @param array $opts
72+
* @param string $serialized
73+
* @param array $opts
7474
* @return mixed
7575
* @throws RuntimeException on unserialize error
7676
*/
@@ -89,7 +89,7 @@ public function unserialize($serialized, array $opts = array())
8989
return $serialized;
9090
}
9191

92-
// If we have a serialized boolean false value, just return false;
92+
// If we have a serialized boolean false value, just return false;
9393
// prevents the unserialize handler from creating an error.
9494
if ($serialized === self::$serializedFalse) {
9595
return false;

‎src/Adapter/PythonPickle.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1333,7 +1333,8 @@ protected function _loadTuple2()
13331333
*
13341334
* @return void
13351335
*/
1336-
protected function _loadTuple3() {
1336+
protected function _loadTuple3()
1337+
{
13371338
$value3 = array_pop($this->_stack);
13381339
$value2 = array_pop($this->_stack);
13391340
$value1 = array_pop($this->_stack);

‎src/Adapter/Wddx.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class Wddx extends AbstractAdapter
3131

3232
/**
3333
* Constructor
34-
*
34+
*
3535
* @param array $options
3636
* @return void
3737
* @throws ExtensionNotLoadedException if wddx extension not found
@@ -47,9 +47,9 @@ public function __construct($options = array())
4747

4848
/**
4949
* Serialize PHP to WDDX
50-
*
51-
* @param mixed $value
52-
* @param array $opts
50+
*
51+
* @param mixed $value
52+
* @param array $opts
5353
* @return string
5454
* @throws RuntimeException on wddx error
5555
*/
@@ -72,9 +72,9 @@ public function serialize($value, array $opts = array())
7272

7373
/**
7474
* Unserialize from WDDX to PHP
75-
*
76-
* @param string $wddx
77-
* @param array $opts
75+
*
76+
* @param string $wddx
77+
* @param array $opts
7878
* @return mixed
7979
* @throws RuntimeException on wddx error
8080
*/

‎src/AdapterPluginManager.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* Plugin manager implementation for serializer adapters.
1717
*
1818
* Enforces that adapters retrieved are instances of
19-
* Adapter\AdapterInterface. Additionally, it registers a number of default
19+
* Adapter\AdapterInterface. Additionally, it registers a number of default
2020
* adapters available.
2121
*
2222
* @category Zend
@@ -26,7 +26,7 @@ class AdapterPluginManager extends AbstractPluginManager
2626
{
2727
/**
2828
* Default set of adapters
29-
*
29+
*
3030
* @var array
3131
*/
3232
protected $invokableClasses = array(
@@ -45,8 +45,8 @@ class AdapterPluginManager extends AbstractPluginManager
4545
*
4646
* Checks that the adapter loaded is an instance
4747
* of Adapter\AdapterInterface.
48-
*
49-
* @param mixed $plugin
48+
*
49+
* @param mixed $plugin
5050
* @return void
5151
* @throws Exception\RuntimeException if invalid
5252
*/

0 commit comments

Comments
 (0)