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

Commit

Permalink
Merge branch 'master', remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@EpeeCheeze
EpeeCheeze committed Oct 3, 2013
128 parents 82ff3ba + 1b53cdf + acb21e9 + 57fe8e9 + 49b845f + 1506bd8 + 0422a6e + 990f5f1 + 4798483 + a33ceb1 + 3787c5a + be1f78e + 944eef9 + aa16b4a + 24e6305 + f8d98c4 + 61cfbb8 + 96d0551 + acc2a46 + f70a8c2 + 7b89f79 + 943d58e + c40b665 + 42ba32c + 1730b26 + 932edde + dc9b974 + 1a05b42 + 01cbd6f + fe46ab5 + 9442908 + 7a5a1b8 + 5e96208 + ac5855b + 3d91eec + b6038ed + 4ead487 + 314f415 + 0b54361 + d7353a4 + 31b63d7 + ec487e1 + ce398bb + 5b4137d + 8353126 + 1e8c7b8 + a5fd1c1 + 485628f + 4f2f689 + a44cce0 + 4a5aec0 + c931a3d + dbb4a85 + 61b2b6a + 66509ee + 7e24d5d + 01cfc3b + c0e12d0 + 5071c77 + f4c654e + 803ce88 + 11b33de + b45194c + a993356 + b58900f + 6f28391 + 80ebd20 + e572be4 + 2ce0c75 + 99c1db1 + 75447c2 + 4e63318 + 7f1db80 + 536bdd5 + 92c20ae + 67690dc + 75fad5c + 94f88dc + 9379d5a + 5f8209d + f70afcc + 493858c + eeacea8 + cecc8e5 + 59d9085 + 4c9c2fc + 50e8d8a + 7563fb1 + 6b50c1b + 914c8bd + e1d5120 + 8f7913e + 85b6a8e + 7cb373f + d917e2a + e375cf4 + f9b74b8 + 25e480d + aeffc49 + 3f8e166 + 99084c3 + aead0e9 + 02447d8 + 21c18f9 + 8860d1d + 431f220 + 67ec1da + d33b5ba + 011e4c8 + d728180 + 028a1ef + 0b023c0 + 98db888 + 8dd2f16 + 817fb7c + 9aaf514 + 9e4ca8d + 33fece8 + 7d1f532 + a347838 + 16acbbd + f5555a4 + b6f5beb + a5273cd + f39ef4b + 01e4b13 + b1693f6 + 24f2e71 commit f661746
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 33 deletions.
10 changes: 3 additions & 7 deletions test/AccessControllerTest.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_Memory
*/

namespace ZendTest\Memory;
Expand All @@ -16,9 +15,6 @@
use Zend\Memory\Container;

/**
* @category Zend
* @package Zend_Memory
* @subpackage UnitTests
* @group Zend_Memory
*/
class AccessControllerTest extends \PHPUnit_Framework_TestCase
Expand Down Expand Up @@ -62,14 +58,14 @@ public function testValueAccess()
$this->assertEquals($memObject->getRef(), '012_456789');

// value property
$this->assertEquals((string)$memObject->value, '012_456789');
$this->assertEquals((string) $memObject->value, '012_456789');

$memObject->value[7] = '_';
$this->assertEquals((string)$memObject->value, '012_456_89');
$this->assertEquals((string) $memObject->value, '012_456_89');

$memObject->value = 'another value';
$this->assertTrue($memObject->value instanceof \Zend\Memory\Value);
$this->assertEquals((string)$memObject->value, 'another value');
$this->assertEquals((string) $memObject->value, 'another value');
}

/**
Expand Down
10 changes: 3 additions & 7 deletions test/LockedTest.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_Memory
*/

namespace ZendTest\Memory;

use Zend\Memory\Container;

/**
* @category Zend
* @package Zend_Memory
* @subpackage UnitTests
* @group Zend_Memory
*/
class LockedTest extends \PHPUnit_Framework_TestCase
Expand Down Expand Up @@ -45,13 +41,13 @@ public function testValueAccess()
$this->assertEquals($memObject->getRef(), '012_456789');

// value property
$this->assertEquals((string)$memObject->value, '012_456789');
$this->assertEquals((string) $memObject->value, '012_456789');

$memObject->value[7] = '_';
$this->assertEquals((string)$memObject->value, '012_456_89');
$this->assertEquals((string) $memObject->value, '012_456_89');

$memObject->value = 'another value';
$this->assertEquals((string)$memObject->value, 'another value');
$this->assertEquals((string) $memObject->value, 'another value');
}

/**
Expand Down
4 changes: 0 additions & 4 deletions test/MemoryManagerTest.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_Memory
*/

namespace ZendTest\Memory;
Expand All @@ -17,9 +16,6 @@


/**
* @category Zend
* @package Zend_Memory
* @subpackage UnitTests
* @group Zend_Memory
*/
class MemoryManagerTest extends \PHPUnit_Framework_TestCase
Expand Down
11 changes: 3 additions & 8 deletions test/MovableTest.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_Memory
*/

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

/**
* @category Zend
* @package Zend_Memory
* @subpackage UnitTests
* @group Zend_Memory
*/
class MovableTest extends \PHPUnit_Framework_TestCase
Expand Down Expand Up @@ -48,14 +44,14 @@ public function testValueAccess()
$this->assertEquals($memObject->getRef(), '012_456789');

// value property
$this->assertEquals((string)$memObject->value, '012_456789');
$this->assertEquals((string) $memObject->value, '012_456789');

$memObject->value[7] = '_';
$this->assertEquals((string)$memObject->value, '012_456_89');
$this->assertEquals((string) $memObject->value, '012_456_89');

$memObject->value = 'another value';
$this->assertTrue($memObject->value instanceof \Zend\Memory\Value);
$this->assertEquals((string)$memObject->value, 'another value');
$this->assertEquals((string) $memObject->value, 'another value');
}

/**
Expand Down Expand Up @@ -132,7 +128,6 @@ public function testInvalidSetThrowException()

/**
* Memory manager helper
*
*/
class DummyMemoryManager extends Memory\MemoryManager
{
Expand Down
10 changes: 3 additions & 7 deletions test/ValueTest.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_Memory
*/

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

/**
* @category Zend
* @package Zend_Memory
* @subpackage UnitTests
* @group Zend_Memory
*/
class ValueTest extends \PHPUnit_Framework_TestCase
Expand Down Expand Up @@ -52,7 +48,7 @@ public function testToString()
$this->assertEquals($valueObject->__toString(), '0123456789');

$this->assertEquals(strlen($valueObject), 10);
$this->assertEquals((string)$valueObject, '0123456789');
$this->assertEquals((string) $valueObject, '0123456789');
}

/**
Expand All @@ -64,13 +60,13 @@ public function testArrayAccess()
$this->assertEquals($valueObject[8], '8');

$valueObject[2] = '_';
$this->assertEquals((string)$valueObject, '01_3456789');
$this->assertEquals((string) $valueObject, '01_3456789');


$error_level = error_reporting();
error_reporting($error_level & ~E_NOTICE);
$valueObject[10] = '_';
$this->assertEquals((string)$valueObject, '01_3456789_');
$this->assertEquals((string) $valueObject, '01_3456789_');
error_reporting($error_level);
}
}
Expand Down

0 comments on commit f661746

Please sign in to comment.