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

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Quoc Vu committed May 9, 2013
106 parents 9623b87 + fef33e6 + a55293c + aecb8f4 + ef44cf1 + bc4610b + 8c773ad + 0481606 + d1304e2 + d3d5a56 + 533570c + 6e30cb0 + 82c88d1 + 88c4f3b + c96ebb3 + f0320b1 + cb0afaa + 128be4b + 34cd6a3 + ec2aab9 + 809bd88 + 77026e3 + c2796da + 0ee8602 + bf4e728 + cd33c2d + 32497e5 + 79eb7d0 + 8cc5d58 + 869ab1c + 436e613 + ab7d56c + 6dbeef6 + 84670b1 + cccfba9 + 2717653 + b4dd364 + 460818e + b5ac15d + 2d218aa + 046d669 + 5597f80 + 98dc299 + 01b3149 + b0177b5 + 74f8270 + 62799e5 + 512426e + 5a9a928 + 3b3e691 + 6f57ae9 + 116cf37 + bb991fd + 1ce1893 + 5000327 + 32beb38 + fe88f0e + 49921e6 + 37a7d0c + aeda378 + ba0d8a9 + c140dfc + 6c6a51d + 473be1c + 33a0274 + 56352fd + 8119cdf + 61d3103 + 4a23da8 + aed1a4d + d208606 + 3f667bd + 617a96b + ddb5852 + 6e16921 + 9418fac + 17b5ef4 + 846edfb + 216ac0e + 6387996 + 1681df7 + 8557890 + 792de65 + 072f053 + fbc1502 + 482716d + 0da8a0e + 7d9112c + ca312d7 + cef4359 + 711d775 + 7826111 + 14b10f4 + 7b6700e + f304770 + 57e491b + c3425d2 + d591073 + 2235288 + d4694ac + 56d8e16 + 07f05df + 622531f + 641a66a + 4938b37 + 4bda1f3 commit b1e478c
Show file tree
Hide file tree
Showing 127 changed files with 2,067 additions and 607 deletions.
7 changes: 4 additions & 3 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,13 @@
"zendframework/zend-i18n": "Zend\\I18n component",
"zendframework/zend-servicemanager": "Zend\\ServiceManager component",
"zendframework/zend-uri": "Zend\\Uri component for UriNormalize filter",
"zendframework/zend-validator": "Zend\\Validator component"
"zendframework/zend-validator": "Zend\\Validator component",
"zendframework/zend-stdlib": "Zend\\Stdlib component"
},
"extra": {
"branch-alias": {
"dev-master": "2.4-dev",
"dev-develop": "2.5-dev"
"dev-master": "2.2-dev",
"dev-develop": "2.3-dev"
}
},
"autoload-dev": {
Expand Down
27 changes: 4 additions & 23 deletions src/AbstractFilter.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,15 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Filter
*/

namespace Zend\Filter;

use Traversable;
use Zend\Stdlib\ErrorHandler;
use Zend\Stdlib\StringUtils;

/**
* @category Zend
* @package Zend_Filter
*/
abstract class AbstractFilter implements FilterInterface
{
/**
Expand All @@ -26,27 +21,13 @@ abstract class AbstractFilter implements FilterInterface
*/
protected $options = array();

/**
* Is PCRE is compiled with UTF-8 and Unicode support
*
* @var boolean
**/
protected static $hasPcreUnicodeSupport = null;

/**
* @return bool
* @deprecated Since 2.1.0
*/
public static function hasPcreUnicodeSupport()
{
if (static::$hasPcreUnicodeSupport === null) {
static::$hasPcreUnicodeSupport = false;
ErrorHandler::start();
if (defined('PREG_BAD_UTF8_OFFSET_ERROR') && preg_match('/\pL/u', 'a') == 1) {
static::$hasPcreUnicodeSupport = true;
}
ErrorHandler::stop();
}
return static::$hasPcreUnicodeSupport;
return StringUtils::hasPcreUnicodeSupport();
}

/**
Expand Down
7 changes: 1 addition & 6 deletions src/AbstractUnicode.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Filter
*/

namespace Zend\Filter;

/**
* @category Zend
* @package Zend_Filter
*/
abstract class AbstractUnicode extends AbstractFilter
{
/**
Expand Down
7 changes: 1 addition & 6 deletions src/BaseName.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Filter
*/

namespace Zend\Filter;

/**
* @category Zend
* @package Zend_Filter
*/
class BaseName extends AbstractFilter
{
/**
Expand Down
21 changes: 8 additions & 13 deletions src/Boolean.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,15 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Filter
*/

namespace Zend\Filter;

use Traversable;
use Zend\Stdlib\ArrayUtils;

/**
* @category Zend
* @package Zend_Filter
*/
class Boolean extends AbstractFilter
{
const TYPE_BOOLEAN = 1;
Expand Down Expand Up @@ -93,9 +88,9 @@ public function __construct($typeOrOptions = null, $casting = true, $translation
/**
* Set boolean types
*
* @param integer|array $type
* @param int|array $type
* @throws Exception\InvalidArgumentException
* @return Boolean
* @return bool
*/
public function setType($type = null)
{
Expand Down Expand Up @@ -139,21 +134,21 @@ public function getType()
/**
* Set the working mode
*
* @param boolean $flag When true this filter works like cast
* @param bool $flag When true this filter works like cast
* When false it recognises only true and false
* and all other values are returned as is
* @return Boolean
* @return bool
*/
public function setCasting($flag = true)
{
$this->options['casting'] = (boolean) $flag;
$this->options['casting'] = (bool) $flag;
return $this;
}

/**
* Returns the casting option
*
* @return boolean
* @return bool
*/
public function getCasting()
{
Expand All @@ -163,7 +158,7 @@ public function getCasting()
/**
* @param array|Traversable $translations
* @throws Exception\InvalidArgumentException
* @return Boolean
* @return bool
*/
public function setTranslations($translations)
{
Expand Down
7 changes: 1 addition & 6 deletions src/Callback.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,14 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Filter
*/

namespace Zend\Filter;

use Traversable;

/**
* @category Zend
* @package Zend_Filter
*/
class Callback extends AbstractFilter
{
/**
Expand Down
6 changes: 1 addition & 5 deletions src/Compress.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Filter
*/

namespace Zend\Filter;
Expand All @@ -15,9 +14,6 @@

/**
* Compresses a given string
*
* @category Zend
* @package Zend_Filter
*/
class Compress extends AbstractFilter
{
Expand Down
6 changes: 1 addition & 5 deletions src/Compress/AbstractCompressionAlgorithm.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Filter
*/

namespace Zend\Filter\Compress;
Expand All @@ -15,9 +14,6 @@

/**
* Abstract compression adapter
*
* @category Zend
* @package Zend_Filter
*/
abstract class AbstractCompressionAlgorithm implements CompressionAlgorithmInterface
{
Expand Down
10 changes: 3 additions & 7 deletions src/Compress/Bz2.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Filter
*/

namespace Zend\Filter\Compress;
Expand All @@ -14,9 +13,6 @@

/**
* Compression adapter for Bz2
*
* @category Zend
* @package Zend_Filter
*/
class Bz2 extends AbstractCompressionAlgorithm
{
Expand Down Expand Up @@ -51,7 +47,7 @@ public function __construct($options = null)
/**
* Returns the set blocksize
*
* @return integer
* @return int
*/
public function getBlocksize()
{
Expand All @@ -61,7 +57,7 @@ public function getBlocksize()
/**
* Sets a new blocksize
*
* @param integer $blocksize
* @param int $blocksize
* @throws Exception\InvalidArgumentException
* @return Bz2
*/
Expand Down
6 changes: 1 addition & 5 deletions src/Compress/CompressionAlgorithmInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,14 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Filter
*/

namespace Zend\Filter\Compress;

/**
* Compression interface
*
* @category Zend
* @package Zend_Filter
*/
interface CompressionAlgorithmInterface
{
Expand Down
10 changes: 3 additions & 7 deletions src/Compress/Gz.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Filter
*/

namespace Zend\Filter\Compress;
Expand All @@ -14,9 +13,6 @@

/**
* Compression adapter for Gzip (ZLib)
*
* @category Zend
* @package Zend_Filter
*/
class Gz extends AbstractCompressionAlgorithm
{
Expand Down Expand Up @@ -53,7 +49,7 @@ public function __construct($options = null)
/**
* Returns the set compression level
*
* @return integer
* @return int
*/
public function getLevel()
{
Expand All @@ -63,7 +59,7 @@ public function getLevel()
/**
* Sets a new compression level
*
* @param integer $level
* @param int $level
* @throws Exception\InvalidArgumentException
* @return Gz
*/
Expand Down
6 changes: 1 addition & 5 deletions src/Compress/Lzf.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Filter
*/

namespace Zend\Filter\Compress;
Expand All @@ -14,9 +13,6 @@

/**
* Compression adapter for Lzf
*
* @category Zend
* @package Zend_Filter
*/
class Lzf implements CompressionAlgorithmInterface
{
Expand Down
10 changes: 2 additions & 8 deletions src/Compress/Rar.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Filter
*/

namespace Zend\Filter\Compress;
Expand All @@ -14,9 +13,6 @@

/**
* Compression adapter for Rar
*
* @category Zend
* @package Zend_Filter
*/
class Rar extends AbstractCompressionAlgorithm
{
Expand Down Expand Up @@ -182,14 +178,12 @@ public function compress($content)
* Decompresses the given content
*
* @param string $content
* @return boolean
* @return bool
* @throws Exception\RuntimeException if archive not found, cannot be opened,
* or error during decompression
*/
public function decompress($content)
{
$archive = $this->getArchive();

if (!file_exists($content)) {
throw new Exception\RuntimeException('RAR Archive not found');
}
Expand Down
Loading

0 comments on commit b1e478c

Please sign in to comment.