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 'zf2/develop' into zend-validator-bitwise
Browse files Browse the repository at this point in the history
  • Loading branch information
Corentin Larose committed Oct 22, 2013
89 parents 98ebbd7 + b40eff9 + 1ebffd3 + d3f565c + 5daa598 + 9cc3538 + 125f523 + 4dc00f8 + e3a79a6 + 79495fe + 076734b + fb7cd20 + c20864d + 6004e35 + 67864ef + 7e47bfe + a90eaf9 + d6acc44 + 28a177e + 7c870c6 + a9a3bce + 8dbf37e + 1592ea0 + 639695d + 71b7690 + 95f6ca9 + 826a0e1 + 5998122 + 34263bb + 73b49a3 + a7937fe + 18bc286 + 7c2f341 + 3fd24f6 + 46b66eb + 5dc451e + 6cc63be + 36c3273 + d866e82 + 91a7d10 + d7310a9 + 024435b + 9d596bf + 205ad91 + 827e841 + aacf431 + 37d0971 + 4e0f2d8 + d00b2c8 + 2931e8c + 570af36 + fead52a + 4c9df22 + a6fe452 + 8ca93b9 + ec770ab + a20b5be + febd956 + faa4251 + 26b9ab2 + 99a6970 + b658520 + af1b50e + 8517056 + b91ed9e + fb19f47 + a79eb09 + 603dc92 + 4f43ff8 + 1a68958 + 74881b8 + a2576ca + c631a3a + 3ef543a + 3ee1aa8 + 8d10c77 + c5f0310 + 8a81857 + 574c335 + 1ae1507 + 8fc8a50 + 6ab84df + f390a13 + f0db133 + da71a47 + b991bc1 + 45b1109 + 29f5877 + 4934ff0 commit 53f3070
Show file tree
Hide file tree
Showing 29 changed files with 17 additions and 133 deletions.
4 changes: 0 additions & 4 deletions test/AbstractOnlineTestCase.php
View file
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_Ldap
*/

namespace ZendTest\Ldap;

use Zend\Ldap;

/**
* @category Zend
* @package Zend_Ldap
* @subpackage UnitTests
* @group Zend_Ldap
*/
abstract class AbstractOnlineTestCase extends AbstractTestCase
Expand Down
4 changes: 0 additions & 4 deletions test/AbstractTestCase.php
View file
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_Ldap
*/

namespace ZendTest\Ldap;

use Zend\Ldap\Node;

/**
* @category Zend
* @package Zend_Ldap
* @subpackage UnitTests
* @group Zend_Ldap
*/
abstract class AbstractTestCase extends \PHPUnit_Framework_TestCase
Expand Down
4 changes: 0 additions & 4 deletions test/AttributeTest.php
View file
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_Ldap
*/

namespace ZendTest\Ldap;

use Zend\Ldap\Attribute;

/**
* @category Zend
* @package Zend_Ldap
* @subpackage UnitTests
* @group Zend_Ldap
*/
class AttributeTest extends \PHPUnit_Framework_TestCase
Expand Down
4 changes: 0 additions & 4 deletions test/BindTest.php
View file
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_Ldap
*/

namespace ZendTest\Ldap;
Expand All @@ -20,9 +19,6 @@
*/

/**
* @category Zend
* @package Zend_Ldap
* @subpackage UnitTests
* @group Zend_Ldap
*/
class BindTest extends \PHPUnit_Framework_TestCase
Expand Down
4 changes: 0 additions & 4 deletions test/CanonTest.php
View file
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_Ldap
*/

namespace ZendTest\Ldap;
Expand All @@ -20,9 +19,6 @@
*/

/**
* @category Zend
* @package Zend_Ldap
* @subpackage UnitTests
* @group Zend_Ldap
*/
class CanonTest extends \PHPUnit_Framework_TestCase
Expand Down
4 changes: 0 additions & 4 deletions test/ChangePasswordTest.php
View file
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_Ldap
*/

namespace ZendTest\Ldap;
Expand All @@ -15,9 +14,6 @@
use Zend\Ldap\Node;

/**
* @category Zend
* @package Zend_Ldap
* @subpackage UnitTests
* @group Zend_Ldap
*/

Expand Down
4 changes: 0 additions & 4 deletions test/ConnectTest.php
View file
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_Ldap
*/

namespace ZendTest\Ldap;
Expand All @@ -20,9 +19,6 @@
*/

/**
* @category Zend
* @package Zend_Ldap
* @subpackage UnitTests
* @group Zend_Ldap
*/
class ConnectTest extends \PHPUnit_Framework_TestCase
Expand Down
4 changes: 0 additions & 4 deletions test/Converter/ConverterTest.php
View file
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_Ldap
*/

namespace ZendTest\Ldap\Converter;
Expand All @@ -15,9 +14,6 @@
use Zend\Ldap\Converter\Converter;

/**
* @category Zend
* @package Zend_Ldap
* @subpackage UnitTests
* @group Zend_Ldap
*/
class ConverterTest extends \PHPUnit_Framework_TestCase
Expand Down
4 changes: 0 additions & 4 deletions test/CopyRenameTest.php
View file
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_Ldap
*/

namespace ZendTest\Ldap;

use Zend\Ldap;

/**
* @category Zend
* @package Zend_Ldap
* @subpackage UnitTests
* @group Zend_Ldap
*/
class CopyRenameTest extends AbstractOnlineTestCase
Expand Down
4 changes: 0 additions & 4 deletions test/CrudTest.php
View file
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_Ldap
*/

namespace ZendTest\Ldap;
Expand All @@ -14,9 +13,6 @@
use Zend\Ldap\Exception;

/**
* @category Zend
* @package Zend_Ldap
* @subpackage UnitTests
* @group Zend_Ldap
*/
class CrudTest extends AbstractOnlineTestCase
Expand Down
28 changes: 12 additions & 16 deletions test/Dn/CreationTest.php
View file
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_Ldap
*/

namespace ZendTest\Ldap\Dn;
Expand All @@ -14,9 +13,6 @@
use Zend\Ldap\Exception;

/**
* @category Zend
* @package Zend_Ldap
* @subpackage UnitTests
* @group Zend_Ldap
* @group Zend_Ldap_Dn
*/
Expand Down Expand Up @@ -116,35 +112,35 @@ public function testDnCreationWithDifferentCaseFoldings()
$dnString3 = 'cn=Baker\\, Alice,cn=Users+ou=Lab,dc=example,dc=com';

$dn = Ldap\Dn::fromString($dnString1, null);
$this->assertEquals($dnString1, (string)$dn);
$this->assertEquals($dnString1, (string) $dn);
$dn->setCaseFold(Ldap\Dn::ATTR_CASEFOLD_UPPER);
$this->assertEquals($dnString2, (string)$dn);
$this->assertEquals($dnString2, (string) $dn);
$dn->setCaseFold(Ldap\Dn::ATTR_CASEFOLD_LOWER);
$this->assertEquals($dnString3, (string)$dn);
$this->assertEquals($dnString3, (string) $dn);

$dn = Ldap\Dn::fromString($dnString1, Ldap\Dn::ATTR_CASEFOLD_UPPER);
$this->assertEquals($dnString2, (string)$dn);
$this->assertEquals($dnString2, (string) $dn);
$dn->setCaseFold(null);
$this->assertEquals($dnString1, (string)$dn);
$this->assertEquals($dnString1, (string) $dn);
$dn->setCaseFold(Ldap\Dn::ATTR_CASEFOLD_LOWER);
$this->assertEquals($dnString3, (string)$dn);
$this->assertEquals($dnString3, (string) $dn);

$dn = Ldap\Dn::fromString($dnString1, Ldap\Dn::ATTR_CASEFOLD_LOWER);
$this->assertEquals($dnString3, (string)$dn);
$this->assertEquals($dnString3, (string) $dn);
$dn->setCaseFold(Ldap\Dn::ATTR_CASEFOLD_UPPER);
$this->assertEquals($dnString2, (string)$dn);
$this->assertEquals($dnString2, (string) $dn);
$dn->setCaseFold(Ldap\Dn::ATTR_CASEFOLD_LOWER);
$this->assertEquals($dnString3, (string)$dn);
$this->assertEquals($dnString3, (string) $dn);
$dn->setCaseFold(Ldap\Dn::ATTR_CASEFOLD_UPPER);
$this->assertEquals($dnString2, (string)$dn);
$this->assertEquals($dnString2, (string) $dn);

Ldap\Dn::setDefaultCaseFold(Ldap\Dn::ATTR_CASEFOLD_UPPER);
$dn = Ldap\Dn::fromString($dnString1, null);
$this->assertEquals($dnString2, (string)$dn);
$this->assertEquals($dnString2, (string) $dn);

Ldap\Dn::setDefaultCaseFold(null);
$dn = Ldap\Dn::fromString($dnString1, null);
$this->assertEquals($dnString1, (string)$dn);
$this->assertEquals($dnString1, (string) $dn);

Ldap\Dn::setDefaultCaseFold(Ldap\Dn::ATTR_CASEFOLD_NONE);
}
Expand Down
4 changes: 0 additions & 4 deletions test/Dn/EscapingTest.php
View file
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_Ldap
*/

namespace ZendTest\Ldap\Dn;

use Zend\Ldap;

/**
* @category Zend
* @package Zend_Ldap
* @subpackage UnitTests
* @group Zend_Ldap
* @group Zend_Ldap_Dn
*/
Expand Down
4 changes: 0 additions & 4 deletions test/Dn/ExplodingTest.php
View file
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_Ldap
*/

namespace ZendTest\Ldap\Dn;

use Zend\Ldap;

/**
* @category Zend
* @package Zend_Ldap
* @subpackage UnitTests
* @group Zend_Ldap
* @group Zend_Ldap_Dn
*/
Expand Down
4 changes: 0 additions & 4 deletions test/Dn/ImplodingTest.php
View file
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_Ldap
*/

namespace ZendTest\Ldap\Dn;

use Zend\Ldap;

/**
* @category Zend
* @package Zend_Ldap
* @subpackage UnitTests
* @group Zend_Ldap
* @group Zend_Ldap_Dn
*/
Expand Down
4 changes: 0 additions & 4 deletions test/Dn/MiscTest.php
View file
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_Ldap
*/

namespace ZendTest\Ldap\Dn;

use Zend\Ldap;

/**
* @category Zend
* @package Zend_Ldap
* @subpackage UnitTests
* @group Zend_Ldap
* @group Zend_Ldap_Dn
*/
Expand Down
4 changes: 0 additions & 4 deletions test/Dn/ModificationTest.php
View file
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_Ldap
*/

namespace ZendTest\Ldap\Dn;
Expand All @@ -14,9 +13,6 @@
use Zend\Ldap\Exception;

/**
* @category Zend
* @package Zend_Ldap
* @subpackage UnitTests
* @group Zend_Ldap
* @group Zend_Ldap_Dn
*/
Expand Down
6 changes: 1 addition & 5 deletions test/FilterTest.php
View file
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_Ldap
*/

namespace ZendTest\Ldap;
Expand All @@ -14,9 +13,6 @@
use Zend\Ldap\Filter;

/**
* @category Zend
* @package Zend_Ldap
* @subpackage UnitTests
* @group Zend_Ldap
*/
class FilterTest extends \PHPUnit_Framework_TestCase
Expand Down Expand Up @@ -91,7 +87,7 @@ public function testFilterCreation()
public function testToStringImplementation()
{
$f1 = Ldap\Filter::ends('name', 'value');
$this->assertEquals($f1->toString(), (string)$f1);
$this->assertEquals($f1->toString(), (string) $f1);
}

public function testNegate()
Expand Down
4 changes: 0 additions & 4 deletions test/Ldif/SimpleDecoderTest.php
View file
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_Ldap
*/

namespace ZendTest\Ldap\Ldif;
Expand All @@ -14,9 +13,6 @@
use ZendTest\Ldap as TestLdap;

/**
* @category Zend
* @package Zend_Ldap
* @subpackage UnitTests
* @group Zend_Ldap
* @group Zend_Ldap_Ldif
*/
Expand Down
4 changes: 0 additions & 4 deletions test/Ldif/SimpleEncoderTest.php
View file
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_Ldap
*/

namespace ZendTest\Ldap\Ldif;
Expand All @@ -14,9 +13,6 @@
use ZendTest\Ldap as TestLdap;

/**
* @category Zend
* @package Zend_Ldap
* @subpackage UnitTests
* @group Zend_Ldap
* @group Zend_Ldap_Ldif
*/
Expand Down

0 comments on commit 53f3070

Please sign in to comment.