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

Commit 074157d

Browse files
kokxkokx
committed
Merge branch 'master' into markup
Conflicts: library/Zend/Markup/Parser/Textile.php library/Zend/Markup/Renderer/AbstractRenderer.php library/Zend/Markup/Renderer/Html.php
2 parents ddc2fa8 + 25f5da9 commit 074157d

30 files changed

+408
-190
lines changed

‎src/Adapter.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
* @subpackage Adapter
1818
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
1919
* @license http://framework.zend.com/license/new-bsd New BSD License
20-
* @version $Id$
2120
*/
2221

2322
/**

‎src/Adapter/AbstractAdapter.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@
1717
* @subpackage Adapter
1818
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
1919
* @license http://framework.zend.com/license/new-bsd New BSD License
20-
* @version $Id$
2120
*/
2221

2322
/**
2423
* @namespace
2524
*/
2625
namespace Zend\Serializer\Adapter;
2726

28-
use Zend\Serializer\Adapter as SerializationAdapter;
27+
use Zend\Serializer\Adapter as SerializationAdapter,
28+
Zend\Serializer\Exception\InvalidArgumentException;
2929

3030
/**
3131
* @uses \Zend\Serializer\Adapter
32-
* @uses \Zend\Serializer\Exception
32+
* @uses \Zend\Serializer\Exception\InvalidArgumentException
3333
* @category Zend
3434
* @package Zend_Serializer
3535
* @subpackage Adapter
@@ -109,7 +109,7 @@ public function getOption($name)
109109
{
110110
$name = (string) $name;
111111
if (!array_key_exists($name, $this->_options)) {
112-
throw new \Zend\Serializer\Exception('Unknown option name "'.$name.'"');
112+
throw new InvalidArgumentException("Unknown option '{$name}'");
113113
}
114114

115115
return $this->_options[$name];

‎src/Adapter/Amf0.php‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,49 +17,48 @@
1717
* @subpackage Adapter
1818
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
1919
* @license http://framework.zend.com/license/new-bsd New BSD License
20-
* @version $Id$
2120
*/
2221

2322
/**
2423
* @namespace
2524
*/
2625
namespace Zend\Serializer\Adapter;
2726

28-
use Zend\Serializer\Exception as SerializationException,
29-
Zend\Amf\Parser as AMFParser;
27+
use Zend\Serializer\Exception\RuntimeException,
28+
Zend\Amf\Parser as AmfParser;
3029

3130
/**
3231
* @uses Zend\Amf\Parser\Amf0\Deserializer
3332
* @uses Zend\Amf\Parser\Amf0\Serializer
3433
* @uses Zend\Amf\Parser\InputStream
3534
* @uses Zend\Amf\Parser\OutputStream
3635
* @uses Zend\Serializer\Adapter\AbstractAdapter
37-
* @uses Zend\Serializer\Exception
36+
* @uses Zend\Serializer\Exception\RuntimeException
3837
* @category Zend
3938
* @package Zend_Serializer
4039
* @subpackage Adapter
4140
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
4241
* @license http://framework.zend.com/license/new-bsd New BSD License
4342
*/
44-
class AMF0 extends AbstractAdapter
43+
class Amf0 extends AbstractAdapter
4544
{
4645
/**
4746
* Serialize a PHP value to AMF0 format
4847
*
4948
* @param mixed $value
5049
* @param array $opts
5150
* @return string
52-
* @throws \Zend\Serializer\Exception
51+
* @throws Zend\Serializer\Exception
5352
*/
5453
public function serialize($value, array $opts = array())
5554
{
5655
try {
57-
$stream = new AMFParser\OutputStream();
58-
$serializer = new AMFParser\Amf0\Serializer($stream);
56+
$stream = new AmfParser\OutputStream();
57+
$serializer = new AmfParser\Amf0\Serializer($stream);
5958
$serializer->writeTypeMarker($value);
6059
return $stream->getStream();
6160
} catch (\Exception $e) {
62-
throw new SerializationException('Serialization failed by previous error', 0, $e);
61+
throw new RuntimeException('Serialization failed: ' . $e->getMessage(), 0, $e);
6362
}
6463
}
6564

@@ -69,16 +68,16 @@ public function serialize($value, array $opts = array())
6968
* @param mixed $value
7069
* @param array $opts
7170
* @return void
72-
* @throws \Zend\Serializer\Exception
71+
* @throws Zend\Serializer\Exception
7372
*/
7473
public function unserialize($value, array $opts = array())
7574
{
7675
try {
77-
$stream = new AMFParser\InputStream($value);
78-
$deserializer = new AMFParser\Amf0\Deserializer($stream);
76+
$stream = new AmfParser\InputStream($value);
77+
$deserializer = new AmfParser\Amf0\Deserializer($stream);
7978
return $deserializer->readTypeMarker();
8079
} catch (\Exception $e) {
81-
throw new SerializationException('Unserialization failed by previous error', 0, $e);
80+
throw new RuntimeException('Unserialization failed: ' . $e->getMessage(), 0, $e);
8281
}
8382
}
8483
}

‎src/Adapter/Amf3.php‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,49 +17,48 @@
1717
* @subpackage Adapter
1818
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
1919
* @license http://framework.zend.com/license/new-bsd New BSD License
20-
* @version $Id$
2120
*/
2221

2322
/**
2423
* @namespace
2524
*/
2625
namespace Zend\Serializer\Adapter;
2726

28-
use Zend\Serializer\Exception as SerializationException,
29-
Zend\Amf\Parser as AMFParser;
27+
use Zend\Serializer\Exception\RuntimeException,
28+
Zend\Amf\Parser as AmfParser;
3029

3130
/**
3231
* @uses Zend\Amf\Parser\Amf3\Deserializer
3332
* @uses Zend\Amf\Parser\Amf3\Serializer
3433
* @uses Zend\Amf\Parser\InputStream
3534
* @uses Zend\Amf\Parser\OutputStream
3635
* @uses Zend\Serializer\Adapter\AbstractAdapter
37-
* @uses Zend\Serializer\Exception
36+
* @uses Zend\Serializer\Exception\RuntimeException
3837
* @category Zend
3938
* @package Zend_Serializer
4039
* @subpackage Adapter
4140
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
4241
* @license http://framework.zend.com/license/new-bsd New BSD License
4342
*/
44-
class AMF3 extends AbstractAdapter
43+
class Amf3 extends AbstractAdapter
4544
{
4645
/**
4746
* Serialize a PHP value to AMF3 format
4847
*
4948
* @param mixed $value
5049
* @param array $opts
5150
* @return string
52-
* @throws \Zend\Serializer\Exception
51+
* @throws Zend\Serializer\Exception
5352
*/
5453
public function serialize($value, array $opts = array())
5554
{
5655
try {
57-
$stream = new AMFParser\OutputStream();
58-
$serializer = new AMFParser\Amf3\Serializer($stream);
56+
$stream = new AmfParser\OutputStream();
57+
$serializer = new AmfParser\Amf3\Serializer($stream);
5958
$serializer->writeTypeMarker($value);
6059
return $stream->getStream();
6160
} catch (\Exception $e) {
62-
throw new SerializationException('Serialization failed by previous error', 0, $e);
61+
throw new RuntimeException('Serialization failed: ' . $e->getMessage(), 0, $e);
6362
}
6463
}
6564

@@ -69,16 +68,16 @@ public function serialize($value, array $opts = array())
6968
* @param mixed $value
7069
* @param array $opts
7170
* @return string
72-
* @throws \Zend\Serializer\Exception
71+
* @throws Zend\Serializer\Exception
7372
*/
7473
public function unserialize($value, array $opts = array())
7574
{
7675
try {
77-
$stream = new AMFParser\InputStream($value);
76+
$stream = new AmfParser\InputStream($value);
7877
$deserializer = new AMFParser\Amf3\Deserializer($stream);
7978
return $deserializer->readTypeMarker();
8079
} catch (\Exception $e) {
81-
throw new SerializationException('Unserialization failed by previous error', 0, $e);
80+
throw new RuntimeException('Unserialization failed: ' . $e->getMessage(), 0, $e);
8281
}
8382
}
8483
}

‎src/Adapter/IgBinary.php‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,20 @@
1717
* @subpackage Adapter
1818
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
1919
* @license http://framework.zend.com/license/new-bsd New BSD License
20-
* @version $Id$
2120
*/
2221

2322
/**
2423
* @namespace
2524
*/
2625
namespace Zend\Serializer\Adapter;
2726

28-
use Zend\Serializer\Exception as SerializationException;
27+
use Zend\Serializer\Exception\RuntimeException,
28+
Zend\Serializer\Exception\ExtensionNotLoadedException;
2929

3030
/**
31-
* @uses \Zend\Serializer\Adapter\AbstractAdapter
32-
* @uses \Zend\Serializer\Exception
31+
* @uses Zend\Serializer\Adapter\AbstractAdapter
32+
* @uses Zend\Serializer\Exception\RuntimeException
33+
* @uses Zend\Serializer\Exception\ExtensionNotLoadedException
3334
* @category Zend
3435
* @package Zend_Serializer
3536
* @subpackage Adapter
@@ -48,12 +49,12 @@ class IgBinary extends AbstractAdapter
4849
*
4950
* @param array|\Zend\Config\Config $opts
5051
* @return void
51-
* @throws \Zend\Serializer\Exception If igbinary extension is not present
52+
* @throws Zend\Serializer\Exception If igbinary extension is not present
5253
*/
5354
public function __construct($opts = array())
5455
{
5556
if (!extension_loaded('igbinary')) {
56-
throw new SerializationException('PHP extension "igbinary" is required for this adapter');
57+
throw new ExtensionNotLoadedException('PHP extension "igbinary" is required for this adapter');
5758
}
5859

5960
parent::__construct($opts);
@@ -69,14 +70,14 @@ public function __construct($opts = array())
6970
* @param mixed $value
7071
* @param array $opts
7172
* @return string
72-
* @throws \Zend\Serializer\Exception on igbinary error
73+
* @throws Zend\Serializer\Exception on igbinary error
7374
*/
7475
public function serialize($value, array $opts = array())
7576
{
7677
$ret = igbinary_serialize($value);
7778
if ($ret === false) {
7879
$lastErr = error_get_last();
79-
throw new SerializationException($lastErr['message']);
80+
throw new RuntimeException($lastErr['message']);
8081
}
8182
return $ret;
8283
}
@@ -87,14 +88,14 @@ public function serialize($value, array $opts = array())
8788
* @param string|binary $serialized
8889
* @param array $opts
8990
* @return mixed
90-
* @throws \Zend\Serializer\Exception on igbinary error
91+
* @throws Zend\Serializer\Exception on igbinary error
9192
*/
9293
public function unserialize($serialized, array $opts = array())
9394
{
9495
$ret = igbinary_unserialize($serialized);
9596
if ($ret === null && $serialized !== self::$_serializedNull) {
9697
$lastErr = error_get_last();
97-
throw new SerializationException($lastErr['message']);
98+
throw new RuntimeException($lastErr['message']);
9899
}
99100
return $ret;
100101
}

‎src/Adapter/Json.php‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,22 @@
1717
* @subpackage Adapter
1818
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
1919
* @license http://framework.zend.com/license/new-bsd New BSD License
20-
* @version $Id$
2120
*/
2221

2322
/**
2423
* @namespace
2524
*/
2625
namespace Zend\Serializer\Adapter;
2726

28-
use Zend\Serializer\Exception as SerializationException,
27+
use Zend\Serializer\Exception\InvalidArgumentException,
28+
Zend\Serializer\Exception\RuntimeException,
2929
Zend\Json\Json as ZendJson;
3030

3131
/**
32-
* @uses Zend\Json\Json
3332
* @uses Zend\Serializer\Adapter\AbstractAdapter
34-
* @uses Zend\Serializer\Exception
33+
* @uses Zend\Serializer\Exception\InvalidArgumentException
34+
* @uses Zend\Serializer\Exception\RuntimeException
35+
* @uses Zend\Json\Json
3536
* @category Zend
3637
* @package Zend_Serializer
3738
* @subpackage Adapter
@@ -55,16 +56,18 @@ class Json extends AbstractAdapter
5556
* @param mixed $value
5657
* @param array $opts
5758
* @return string
58-
* @throws \Zend\Serializer\Exception on JSON encoding exception
59+
* @throws Zend\Serializer\Exception on JSON encoding exception
5960
*/
6061
public function serialize($value, array $opts = array())
6162
{
6263
$opts = $opts + $this->_options;
6364

6465
try {
6566
return ZendJson::encode($value, $opts['cycleCheck'], $opts);
67+
} catch (\InvalidArgumentException $e) {
68+
throw new InvalidArgumentException('Serialization failed: ' . $e->getMessage(), 0, $e);
6669
} catch (\Exception $e) {
67-
throw new SerializationException('Serialization failed', 0, $e);
70+
throw new RuntimeException('Serialization failed: ' . $e->getMessage(), 0, $e);
6871
}
6972
}
7073

@@ -81,13 +84,10 @@ public function unserialize($json, array $opts = array())
8184

8285
try {
8386
$ret = ZendJson::decode($json, $opts['objectDecodeType']);
87+
} catch (\InvalidArgumentException $e) {
88+
throw new InvalidArgumentException('Unserialization failed: ' . $e->getMessage(), 0, $e);
8489
} catch (\Exception $e) {
85-
throw new SerializationException('Unserialization failed by previous error', 0, $e);
86-
}
87-
88-
// json_decode returns null for invalid JSON
89-
if ($ret === null && $json !== 'null') {
90-
throw new SerializationException('Invalid json data');
90+
throw new RuntimeException('Unserialization failed: ' . $e->getMessage(), 0, $e);
9191
}
9292

9393
return $ret;

‎src/Adapter/PhpCode.php‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,18 @@
1717
* @subpackage Adapter
1818
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
1919
* @license http://framework.zend.com/license/new-bsd New BSD License
20-
* @version $Id$
2120
*/
2221

2322
/**
2423
* @namespace
2524
*/
2625
namespace Zend\Serializer\Adapter;
2726

28-
use Zend\Serializer\Exception as SerializationException;
27+
use Zend\Serializer\Exception\RuntimeException;
2928

3029
/**
3130
* @uses Zend\Serializer\Adapter\AbstractAdapter
32-
* @uses Zend\Serializer\Exception
31+
* @uses Zend\Serializer\Exception\RuntimeException
3332
* @category Zend
3433
* @package Zend_Serializer
3534
* @subpackage Adapter
@@ -58,14 +57,14 @@ public function serialize($value, array $opts = array())
5857
* @param string $code
5958
* @param array $opts
6059
* @return mixed
61-
* @throws \Zend\Serializer\Exception on eval error
60+
* @throws Zend\Serializer\Exception on eval error
6261
*/
6362
public function unserialize($code, array $opts = array())
6463
{
6564
$eval = @eval('$ret=' . $code . ';');
6665
if ($eval === false) {
6766
$lastErr = error_get_last();
68-
throw new SerializationException('eval failed: ' . $lastErr['message']);
67+
throw new RuntimeException('eval failed: ' . $lastErr['message']);
6968
}
7069
return $ret;
7170
}

0 commit comments

Comments
 (0)