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

Commit 921da84

Browse files
ezimuelezimuel
committed
Merge remote-tracking branch 'zf2/master' into feature/mail
34 parents 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 + 0b2d816 commit 921da84

17 files changed

+85
-107
lines changed

‎src/Adapter/AbstractAdapter.php‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,11 @@
2121

2222
namespace Zend\Serializer\Adapter;
2323

24-
use Zend\Serializer\Adapter as SerializationAdapter,
25-
Zend\Serializer\Exception\InvalidArgumentException;
24+
use Zend\Serializer\Adapter\AdapterInterface as SerializationAdapter,
25+
Zend\Serializer\Exception\InvalidArgumentException,
26+
Zend\Config\Config;
2627

2728
/**
28-
* @uses \Zend\Serializer\Adapter
29-
* @uses \Zend\Serializer\Exception\InvalidArgumentException
3029
* @category Zend
3130
* @package Zend_Serializer
3231
* @subpackage Adapter
@@ -45,7 +44,7 @@ abstract class AbstractAdapter implements SerializationAdapter
4544
/**
4645
* Constructor
4746
*
48-
* @param array|Zend\Config\Config $opts Serializer options
47+
* @param array|Config $opts Serializer options
4948
*/
5049
public function __construct($opts = array())
5150
{
@@ -55,12 +54,12 @@ public function __construct($opts = array())
5554
/**
5655
* Set serializer options
5756
*
58-
* @param array|Zend\Config\Config $opts Serializer options
59-
* @return Zend\Serializer\Adapter\AbstractAdapter
57+
* @param array|Config $opts Serializer options
58+
* @return AbstractAdapter
6059
*/
6160
public function setOptions($opts)
6261
{
63-
if ($opts instanceof \Zend\Config\Config) {
62+
if ($opts instanceof Config) {
6463
$opts = $opts->toArray();
6564
} else {
6665
$opts = (array) $opts;
@@ -77,7 +76,7 @@ public function setOptions($opts)
7776
*
7877
* @param string $name Option name
7978
* @param mixed $value Option value
80-
* @return Zend\Serializer\Adapter\AbstractAdapter
79+
* @return AbstractAdapter
8180
*/
8281
public function setOption($name, $value)
8382
{
@@ -100,7 +99,7 @@ public function getOptions()
10099
*
101100
* @param string $name
102101
* @return mixed
103-
* @throws Zend\Serializer\Exception
102+
* @throws InvalidArgumentException
104103
*/
105104
public function getOption($name)
106105
{

‎src/Adapter.php‎ renamed to ‎src/Adapter/AdapterInterface.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
* @license http://framework.zend.com/license/new-bsd New BSD License
2020
*/
2121

22-
namespace Zend\Serializer;
22+
namespace Zend\Serializer\Adapter;
2323

2424
/**
2525
* @category Zend
@@ -28,7 +28,7 @@
2828
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
2929
* @license http://framework.zend.com/license/new-bsd New BSD License
3030
*/
31-
interface Adapter
31+
interface AdapterInterface
3232
{
3333
/**
3434
* Constructor
@@ -42,7 +42,7 @@ public function __construct($opts = array());
4242
* Set serializer options
4343
*
4444
* @param array|Zend\Config\Config $opts Serializer options
45-
* @return Zend\Serializer\Adapter
45+
* @return AdapterInterface
4646
*/
4747
public function setOptions($opts);
4848

@@ -51,7 +51,7 @@ public function setOptions($opts);
5151
*
5252
* @param string $name Option name
5353
* @param mixed $value Option value
54-
* @return Zend\Serializer\Adapter
54+
* @return AdapterInterface
5555
*/
5656
public function setOption($name, $value);
5757

@@ -67,7 +67,7 @@ public function getOptions();
6767
*
6868
* @param string $name
6969
* @return mixed
70-
* @throws Zend\Serializer\Exception
70+
* @throws AdapterInterface
7171
*/
7272
public function getOption($name);
7373

@@ -77,7 +77,7 @@ public function getOption($name);
7777
* @param mixed $value Data to serialize
7878
* @param array $options Serialize options
7979
* @return string
80-
* @throws Zend\Serializer\Exception
80+
* @throws \Zend\Serializer\Exception\ExceptionInterface
8181
*/
8282
public function serialize($value, array $options = array());
8383

@@ -87,7 +87,7 @@ public function serialize($value, array $options = array());
8787
* @param string $serialized Serialized string
8888
* @param array $options Unserialize options
8989
* @return mixed
90-
* @throws Zend\Serializer\Exception
90+
* @throws \Zend\Serializer\Exception\ExceptionInterface
9191
*/
9292
public function unserialize($serialized, array $options = array());
9393
}

‎src/Adapter/Amf0.php‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,6 @@
2525
Zend\Amf\Parser as AmfParser;
2626

2727
/**
28-
* @uses Zend\Amf\Parser\Amf0\Deserializer
29-
* @uses Zend\Amf\Parser\Amf0\Serializer
30-
* @uses Zend\Amf\Parser\InputStream
31-
* @uses Zend\Amf\Parser\OutputStream
32-
* @uses Zend\Serializer\Adapter\AbstractAdapter
33-
* @uses Zend\Serializer\Exception\RuntimeException
3428
* @category Zend
3529
* @package Zend_Serializer
3630
* @subpackage Adapter
@@ -45,7 +39,7 @@ class Amf0 extends AbstractAdapter
4539
* @param mixed $value
4640
* @param array $opts
4741
* @return string
48-
* @throws Zend\Serializer\Exception
42+
* @throws RuntimeException
4943
*/
5044
public function serialize($value, array $opts = array())
5145
{
@@ -65,7 +59,7 @@ public function serialize($value, array $opts = array())
6559
* @param mixed $value
6660
* @param array $opts
6761
* @return void
68-
* @throws Zend\Serializer\Exception
62+
* @throws RuntimeException
6963
*/
7064
public function unserialize($value, array $opts = array())
7165
{

‎src/Adapter/Amf3.php‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,6 @@
2525
Zend\Amf\Parser as AmfParser;
2626

2727
/**
28-
* @uses Zend\Amf\Parser\Amf3\Deserializer
29-
* @uses Zend\Amf\Parser\Amf3\Serializer
30-
* @uses Zend\Amf\Parser\InputStream
31-
* @uses Zend\Amf\Parser\OutputStream
32-
* @uses Zend\Serializer\Adapter\AbstractAdapter
33-
* @uses Zend\Serializer\Exception\RuntimeException
3428
* @category Zend
3529
* @package Zend_Serializer
3630
* @subpackage Adapter
@@ -45,7 +39,7 @@ class Amf3 extends AbstractAdapter
4539
* @param mixed $value
4640
* @param array $opts
4741
* @return string
48-
* @throws Zend\Serializer\Exception
42+
* @throws RuntimeException
4943
*/
5044
public function serialize($value, array $opts = array())
5145
{
@@ -65,7 +59,7 @@ public function serialize($value, array $opts = array())
6559
* @param mixed $value
6660
* @param array $opts
6761
* @return string
68-
* @throws Zend\Serializer\Exception
62+
* @throws RuntimeException
6963
*/
7064
public function unserialize($value, array $opts = array())
7165
{

‎src/Adapter/IgBinary.php‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@
2525
Zend\Serializer\Exception\ExtensionNotLoadedException;
2626

2727
/**
28-
* @uses Zend\Serializer\Adapter\AbstractAdapter
29-
* @uses Zend\Serializer\Exception\RuntimeException
30-
* @uses Zend\Serializer\Exception\ExtensionNotLoadedException
3128
* @category Zend
3229
* @package Zend_Serializer
3330
* @subpackage Adapter
@@ -46,7 +43,7 @@ class IgBinary extends AbstractAdapter
4643
*
4744
* @param array|\Zend\Config\Config $opts
4845
* @return void
49-
* @throws Zend\Serializer\Exception If igbinary extension is not present
46+
* @throws ExtensionNotLoadedException If igbinary extension is not present
5047
*/
5148
public function __construct($opts = array())
5249
{
@@ -67,7 +64,7 @@ public function __construct($opts = array())
6764
* @param mixed $value
6865
* @param array $opts
6966
* @return string
70-
* @throws Zend\Serializer\Exception on igbinary error
67+
* @throws RuntimeException on igbinary error
7168
*/
7269
public function serialize($value, array $opts = array())
7370
{
@@ -85,7 +82,7 @@ public function serialize($value, array $opts = array())
8582
* @param string|binary $serialized
8683
* @param array $opts
8784
* @return mixed
88-
* @throws Zend\Serializer\Exception on igbinary error
85+
* @throws RuntimeException on igbinary error
8986
*/
9087
public function unserialize($serialized, array $opts = array())
9188
{

‎src/Adapter/Json.php‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@
2626
Zend\Json\Json as ZendJson;
2727

2828
/**
29-
* @uses Zend\Serializer\Adapter\AbstractAdapter
30-
* @uses Zend\Serializer\Exception\InvalidArgumentException
31-
* @uses Zend\Serializer\Exception\RuntimeException
32-
* @uses Zend\Json\Json
3329
* @category Zend
3430
* @package Zend_Serializer
3531
* @subpackage Adapter
@@ -53,7 +49,7 @@ class Json extends AbstractAdapter
5349
* @param mixed $value
5450
* @param array $opts
5551
* @return string
56-
* @throws Zend\Serializer\Exception on JSON encoding exception
52+
* @throws InvalidArgumentException|RuntimeException on JSON encoding exception
5753
*/
5854
public function serialize($value, array $opts = array())
5955
{
@@ -74,6 +70,7 @@ public function serialize($value, array $opts = array())
7470
* @param string $json
7571
* @param array $opts
7672
* @return mixed
73+
* @throws InvalidArgumentException|RuntimeException
7774
*/
7875
public function unserialize($json, array $opts = array())
7976
{

‎src/Adapter/PhpCode.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424
use Zend\Serializer\Exception\RuntimeException;
2525

2626
/**
27-
* @uses Zend\Serializer\Adapter\AbstractAdapter
28-
* @uses Zend\Serializer\Exception\RuntimeException
2927
* @category Zend
3028
* @package Zend_Serializer
3129
* @subpackage Adapter
@@ -54,7 +52,7 @@ public function serialize($value, array $opts = array())
5452
* @param string $code
5553
* @param array $opts
5654
* @return mixed
57-
* @throws Zend\Serializer\Exception on eval error
55+
* @throws RuntimeException on eval error
5856
*/
5957
public function unserialize($code, array $opts = array())
6058
{

‎src/Adapter/PhpSerialize.php‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,10 @@
2121

2222
namespace Zend\Serializer\Adapter;
2323

24-
use Zend\Serializer\Exception\RuntimeException;
24+
use Zend\Serializer\Exception\RuntimeException,
25+
Zend\Config\Config;
2526

2627
/**
27-
* @uses Zend\Serializer\Adapter\AbstractAdapter
28-
* @uses Zend\Serializer\Exception\RuntimeException
2928
* @category Zend
3029
* @package Zend_Serializer
3130
* @subpackage Adapter
@@ -42,7 +41,7 @@ class PhpSerialize extends AbstractAdapter
4241
/**
4342
* Constructor
4443
*
45-
* @param array|Zend\Config\Config $opts
44+
* @param array|Config $opts
4645
* @return void
4746
*/
4847
public function __construct($opts = array())
@@ -62,7 +61,7 @@ public function __construct($opts = array())
6261
* @param mixed $value
6362
* @param array $opts
6463
* @return string
65-
* @throws Zend\Serializer\Exception On serialize error
64+
* @throws RuntimeException On serialize error
6665
*/
6766
public function serialize($value, array $opts = array())
6867
{
@@ -87,7 +86,7 @@ public function serialize($value, array $opts = array())
8786
* @param string $serialized
8887
* @param array $opts
8988
* @return mixed
90-
* @throws Zend\Serializer\Exception on unserialize error
89+
* @throws RuntimeException on unserialize error
9190
*/
9291
public function unserialize($serialized, array $opts = array())
9392
{

0 commit comments

Comments
 (0)