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

Commit

Permalink
Merge branch
Browse files Browse the repository at this point in the history
  • Loading branch information
fdeleon committed Oct 31, 2013
124 parents fe09441 + b5e7532 + 700917d + f10c3b2 + 4f82a12 + ba0d8a9 + c140dfc + 6c6a51d + 473be1c + 33a0274 + 56352fd + 8119cdf + 61d3103 + 4a23da8 + aed1a4d + d208606 + 3f667bd + 617a96b + ddb5852 + 6e16921 + 9418fac + 17b5ef4 + 846edfb + 216ac0e + 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 + 6387996 + 9623b87 + fef33e6 + a55293c + 37a7d0c + aeda378 + 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 + b1e478c + bf4b889 + a289dd2 + 90ed0aa + e6d18f9 + 3417ce7 + 6fe2e03 + 3de0bd7 + c8263a5 + 1e71d7e + 5461037 + 2094f47 + 9e7e067 commit eb9b119
Show file tree
Hide file tree
Showing 72 changed files with 97 additions and 268 deletions.
2 changes: 1 addition & 1 deletion src/BaseName.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public function filter($value)
return null;
}

if (!is_scalar($value)){
if (!is_scalar($value)) {
trigger_error(
sprintf(
'%s expects parameter to be scalar, "%s" given; cannot filter',
Expand Down
2 changes: 1 addition & 1 deletion src/Digits.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public function filter($value)
return null;
}

if (!is_scalar($value)){
if (!is_scalar($value)) {
trigger_error(
sprintf(
'%s expects parameter to be scalar, "%s" given; cannot filter',
Expand Down
2 changes: 1 addition & 1 deletion src/HtmlEntities.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ public function filter($value)
return null;
}

if (!is_scalar($value)){
if (!is_scalar($value)) {
trigger_error(
sprintf(
'%s expects parameter to be scalar, "%s" given; cannot filter',
Expand Down
2 changes: 1 addition & 1 deletion src/Int.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public function filter($value)
return null;
}

if (!is_scalar($value)){
if (!is_scalar($value)) {
trigger_error(
sprintf(
'%s expects parameter to be scalar, "%s" given; cannot filter',
Expand Down
2 changes: 1 addition & 1 deletion src/RealPath.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public function filter($value)
return null;
}

if (!is_scalar($value)){
if (!is_scalar($value)) {
trigger_error(
sprintf(
'%s expects parameter to be scalar, "%s" given; cannot filter',
Expand Down
2 changes: 1 addition & 1 deletion src/StringToLower.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public function filter($value)
return null;
}

if (!is_scalar($value)){
if (!is_scalar($value)) {
trigger_error(
sprintf(
'%s expects parameter to be scalar, "%s" given; cannot filter',
Expand Down
2 changes: 1 addition & 1 deletion src/StringToUpper.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public function filter($value)
return null;
}

if (!is_scalar($value)){
if (!is_scalar($value)) {
trigger_error(
sprintf(
'%s expects parameter to be scalar, "%s" given; cannot filter',
Expand Down
2 changes: 1 addition & 1 deletion src/StripNewlines.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class StripNewlines extends AbstractFilter
* @param string $value
* @return string
*/
public function filter ($value)
public function filter($value)
{
return str_replace(array("\n", "\r"), '', $value);
}
Expand Down
2 changes: 1 addition & 1 deletion src/StripTags.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ public function filter($value)
return null;
}

if (!is_scalar($value)){
if (!is_scalar($value)) {
trigger_error(
sprintf(
'%s expects parameter to be scalar, "%s" given; cannot filter',
Expand Down
2 changes: 1 addition & 1 deletion src/Word/CamelCaseToSeparator.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public function filter($value)
$pattern = array('#(?<=(?:\p{Lu}))(\p{Lu}\p{Ll})#', '#(?<=(?:\p{Ll}|\p{Nd}))(\p{Lu})#');
$replacement = array($this->separator . '\1', $this->separator . '\1');
} else {
$pattern = array('#(?<=(?:[A-Z]))([A-Z]+)([A-Z][A-z])#', '#(?<=(?:[a-z0-9]))([A-Z])#');
$pattern = array('#(?<=(?:[A-Z]))([A-Z]+)([A-Z][a-z])#', '#(?<=(?:[a-z0-9]))([A-Z])#');
$replacement = array('\1' . $this->separator . '\2', $this->separator . '\1');
}

Expand Down
4 changes: 0 additions & 4 deletions test/BaseNameTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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 ZendTest\Filter;
Expand All @@ -14,9 +13,6 @@
use Zend\Stdlib\ErrorHandler;

/**
* @category Zend
* @package Zend_Filter
* @subpackage UnitTests
* @group Zend_Filter
*/
class BaseNameTest extends \PHPUnit_Framework_TestCase
Expand Down
4 changes: 0 additions & 4 deletions test/BooleanTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,13 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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 ZendTest\Filter;

use Zend\Filter\Boolean as BooleanFilter;

/**
* @category Zend
* @package Zend_Filter
* @subpackage UnitTests
* @group Zend_Filter
*/
class BooleanTest extends \PHPUnit_Framework_TestCase
Expand Down
4 changes: 0 additions & 4 deletions test/CallbackTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,13 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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 ZendTest\Filter;

use Zend\Filter\Callback as CallbackFilter;

/**
* @category Zend
* @package Zend_Filter
* @subpackage UnitTests
* @group Zend_Filter
*/
class CallbackTest extends \PHPUnit_Framework_TestCase
Expand Down
4 changes: 0 additions & 4 deletions test/Compress/Bz2Test.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,13 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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 ZendTest\Filter\Compress;

use Zend\Filter\Compress\Bz2 as Bz2Compression;

/**
* @category Zend
* @package Zend_Filter
* @subpackage UnitTests
* @group Zend_Filter
*/
class Bz2Test extends \PHPUnit_Framework_TestCase
Expand Down
4 changes: 0 additions & 4 deletions test/Compress/GzTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,13 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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 ZendTest\Filter\Compress;

use Zend\Filter\Compress\Gz as GzCompression;

/**
* @category Zend
* @package Zend_Filter
* @subpackage UnitTests
* @group Zend_Filter
*/
class GzTest extends \PHPUnit_Framework_TestCase
Expand Down
4 changes: 0 additions & 4 deletions test/Compress/LzfTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,13 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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 ZendTest\Filter\Compress;

use Zend\Filter\Compress\Lzf as LzfCompression;

/**
* @category Zend
* @package Zend_Filter
* @subpackage UnitTests
* @group Zend_Filter
*/
class LzfTest extends \PHPUnit_Framework_TestCase
Expand Down
4 changes: 0 additions & 4 deletions test/Compress/RarTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,13 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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 ZendTest\Filter\Compress;

use Zend\Filter\Compress\Rar as RarCompression;

/**
* @category Zend
* @package Zend_Filter
* @subpackage UnitTests
* @group Zend_Filter
*/
class RarTest extends \PHPUnit_Framework_TestCase
Expand Down
4 changes: 0 additions & 4 deletions test/Compress/SnappyTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,13 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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 ZendTest\Filter\Compress;

use Zend\Filter\Compress\Snappy as SnappyCompression;

/**
* @category Zend
* @package Zend_Filter
* @subpackage UnitTests
* @group Zend_Filter
*/
class SnappyTest extends \PHPUnit_Framework_TestCase
Expand Down
4 changes: 0 additions & 4 deletions test/Compress/TarLoadArchiveTarTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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 ZendTest\Filter\Compress;
Expand All @@ -14,9 +13,6 @@
use Zend\Filter\Exception\ExtensionNotLoadedException;

/**
* @category Zend
* @package Zend_Filter
* @subpackage UnitTests
* @group Zend_Filter
*/
class TarLoadArchveTarTest extends \PHPUnit_Framework_TestCase
Expand Down
4 changes: 0 additions & 4 deletions test/Compress/TarTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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 ZendTest\Filter\Compress;
Expand All @@ -14,9 +13,6 @@
use Zend\Loader\StandardAutoloader;

/**
* @category Zend
* @package Zend_Filter
* @subpackage UnitTests
* @group Zend_Filter
*/
class TarTest extends \PHPUnit_Framework_TestCase
Expand Down
6 changes: 1 addition & 5 deletions test/Compress/ZipTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,13 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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 ZendTest\Filter\Compress;

use Zend\Filter\Compress\Zip as ZipCompression;

/**
* @category Zend
* @package Zend_Filter
* @subpackage UnitTests
* @group Zend_Filter
*/
class ZipTest extends \PHPUnit_Framework_TestCase
Expand All @@ -26,7 +22,7 @@ public function setUp()
$this->markTestSkipped('This adapter needs the zip extension');
}

$this->tmp = sys_get_temp_dir() . '/' . str_replace('\\', '_', __CLASS__);
$this->tmp = sys_get_temp_dir() . DIRECTORY_SEPARATOR . str_replace('\\', '_', __CLASS__);

$files = array(
$this->tmp . '/compressed.zip',
Expand Down
4 changes: 0 additions & 4 deletions test/CompressTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,13 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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 ZendTest\Filter;

use Zend\Filter\Compress as CompressFilter;

/**
* @category Zend
* @package Zend_Filter
* @subpackage UnitTests
* @group Zend_Filter
*/
class CompressTest extends \PHPUnit_Framework_TestCase
Expand Down
4 changes: 0 additions & 4 deletions test/DateTimeFormatterTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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 ZendTest\Filter;
Expand All @@ -14,9 +13,6 @@
use Zend\Filter\DateTimeFormatter;

/**
* @category Zend
* @package Zend_Filter
* @subpackage UnitTests
* @group Zend_Filter
*/
class DateTimeFormatterTest extends \PHPUnit_Framework_TestCase
Expand Down
4 changes: 0 additions & 4 deletions test/DecompressTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,13 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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 ZendTest\Filter;

use Zend\Filter\Decompress as DecompressFilter;

/**
* @category Zend
* @package Zend_Filter
* @subpackage UnitTests
* @group Zend_Filter
*/
class DecompressTest extends \PHPUnit_Framework_TestCase
Expand Down
4 changes: 0 additions & 4 deletions test/DecryptTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,13 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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 ZendTest\Filter;

use Zend\Filter\Decrypt as DecryptFilter;

/**
* @category Zend
* @package Zend_Filter
* @subpackage UnitTests
* @group Zend_Filter
*/
class DecryptTest extends \PHPUnit_Framework_TestCase
Expand Down
Loading

0 comments on commit eb9b119

Please sign in to comment.