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

Commit

Permalink
Merge zendframework/zendframework#5215 into develop
Browse files Browse the repository at this point in the history 
Conflicts:
	tests/ZendTest/Code/Generator/AbstractGeneratorTest.php
	tests/ZendTest/Code/Generator/ClassGeneratorTest.php
	tests/ZendTest/Code/Generator/DocBlock/Tag/AuthorTagTest.php
	tests/ZendTest/Code/Generator/DocBlock/Tag/LicenseTagTest.php
	tests/ZendTest/Code/Generator/DocBlock/Tag/ParamTagTest.php
	tests/ZendTest/Code/Generator/DocBlock/Tag/ReturnTagTest.php
	tests/ZendTest/Code/Generator/DocBlock/TagTest.php
	tests/ZendTest/Code/Generator/DocBlockGeneratorTest.php
	tests/ZendTest/Code/Generator/FileGeneratorTest.php
	tests/ZendTest/Code/Generator/MethodGeneratorTest.php
	tests/ZendTest/Code/Generator/ParameterGeneratorTest.php
	tests/ZendTest/Code/Generator/PropertyGeneratorTest.php
	tests/ZendTest/Code/Generator/PropertyValueGeneratorTest.php
	tests/ZendTest/Code/Generator/ValueGeneratorTest.php
  • Loading branch information
@Maks3w
Maks3w committed Oct 3, 2013
125 parents 6044ba1 + e733e70 + e0070f5 + 0ce4e78 + d678fea + fbadf39 + d24dc4d + 7886448 + 445cc01 + 58a19ab + 194409f + 4a0a5ab + e2b5a72 + 90b47c5 + 89df4b8 + 07eac97 + dbff227 + a8bc04a + 9e53124 + aa8a772 + 1dacd62 + b1d673b + 4ca3a91 + 3823a47 + fcdb53c + 4695159 + 8c4a1a4 + 1ac8bc9 + 266a726 + a48d0b4 + 8bbe006 + f7a58c4 + ef00607 + 03f1a39 + fa9020e + 290a868 + 12376e4 + f183282 + 5609ded + b742a14 + 6ee62cd + 2d5f08c + 5f0a20d + da6d437 + 6020243 + 6cf319f + 7764705 + 8858064 + d35a73e + 4dca7a7 + e331113 + b288c81 + a7e1ad0 + c0434da + bc3b794 + 137fd45 + d2ea768 + 614b493 + f2158f1 + 6ad7c37 + 4f10632 + 1be14cc + 46a76e6 + bb3de95 + f1962e2 + 8c5e72d + 580978e + fcbde5a + 0bc3146 + e29de4d + 3fda4ad + 69ba799 + 3227b7b + 5f6a326 + 0f56ab5 + 5b30430 + a696f90 + 08b23c4 + 6438497 + 1d7c8db + 9d80a9e + 10c5fc3 + 875f572 + d32773b + ab30fab + 679b87a + 4d48267 + 9b1b333 + a1ead02 + 8013fb4 + 257d444 + 742fa1f + 399dc4f + c027f2a + bd63175 + 5faf735 + 6b5631d + e91ce9b + 3c20bc3 + 269ff93 + 3bb86fe + 2cc8054 + ab199de + 4a7857c + a36f375 + a8ec94c + f4ffca4 + 8355c2f + 4f1d801 + fdb75ff + 0a0d8b3 + 59ca0b9 + b28f8fa + 3b565ef + c026857 + e99f31a + 715843c + f85a410 + 2213be0 + 07035bd + 0e9d9ef + 9d3ec66 + d7864b0 + ca8d8cb + b18fa4c commit 1b45d75
Show file tree
Hide file tree
Showing 6 changed files with 0 additions and 26 deletions.
4 changes: 0 additions & 4 deletions test/Adapter/ConsoleTest.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_ProgressBar
*/

namespace ZendTest\ProgressBar\Adapter;
Expand All @@ -15,9 +14,6 @@
require_once 'MockupStream.php';

/**
* @category Zend
* @package Zend_ProgressBar
* @subpackage UnitTests
* @group Zend_ProgressBar
*/
class ConsoleTest extends \PHPUnit_Framework_TestCase
Expand Down
4 changes: 0 additions & 4 deletions test/Adapter/JsPullTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,12 @@
* @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_ProgressBar
*/

namespace ZendTest\ProgressBar\Adapter;


/**
* @category Zend
* @package Zend_ProgressBar
* @subpackage UnitTests
* @group Zend_ProgressBar
*/
class JsPullTest extends \PHPUnit_Framework_TestCase
Expand Down
4 changes: 0 additions & 4 deletions test/Adapter/JsPushTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,11 @@
* @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_ProgressBar
*/

namespace ZendTest\ProgressBar\Adapter;

/**
* @category Zend
* @package Zend_ProgressBar
* @subpackage UnitTests
* @group Zend_ProgressBar
*/
class JsPushTest extends \PHPUnit_Framework_TestCase
Expand Down
6 changes: 0 additions & 6 deletions test/Adapter/MockupStream.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,10 @@
* @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_ProgressBar
*/

namespace ZendTest\ProgressBar\Adapter;

/**
* @category Zend
* @package Zend_ProgressBar
* @subpackage UnitTests
*/
class MockupStream
{

Expand Down
4 changes: 0 additions & 4 deletions test/ProgressBarTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,11 @@
* @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_ProgressBar
*/

namespace ZendTest\ProgressBar;

/**
* @category Zend
* @package Zend_Console
* @subpackage UnitTests
* @group Zend_ProgressBar
*/
class ProgressBarTest extends \PHPUnit_Framework_TestCase
Expand Down
4 changes: 0 additions & 4 deletions test/Upload/AbstractUploadHandlerTest.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_ProgressBar
*/

namespace ZendTest\ProgressBar;

use Zend\ProgressBar\ProgressBar;

/**
* @category Zend
* @package Zend_Console
* @subpackage UnitTests
* @group Zend_ProgressBar
*/
class AbstractUploadHandlerTest extends \PHPUnit_Framework_TestCase
Expand Down

0 comments on commit 1b45d75

Please sign in to comment.