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' into ValidatorMessages
Browse files Browse the repository at this point in the history
  • Loading branch information
Matej Szendi committed Nov 4, 2013
145 parents 7b52962 + 9e9b7fb + 9654dc2 + 77fcf26 + a8d7175 + 2df1fa2 + 2eea980 + 5e212bf + 099a852 + b4fea29 + ca1f464 + 23d6321 + 296e43e + d444a38 + 3db95a1 + 981d623 + 0a2e3ae + af23c99 + 80f5165 + 78d16a9 + 6bc4f23 + ece1d99 + 0b9ced2 + 9d50bff + 476d115 + c660c64 + 23e480a + 2d1a86f + bcd3a85 + d46ca8d + 236d691 + 0c0ae53 + 16da5d7 + 1c4489e + a57bb3d + c14d67b + b241e8d + 10c9e19 + 33f9f3b + 4585cfe + d06b3a5 + 371eaa8 + c9fbe3f + 77552c9 + 5883d28 + 518460f + 63a6a3b + f21d820 + 5b80282 + 8d4f7c0 + 3428c24 + 50a5cf9 + 0fcf91c + ffd0e6c + 90cc750 + 4c0cba4 + 9e64972 + 3a86f54 + f4931d8 + 9c496b9 + f36d38f + 1b580df + dab01ce + bc6e247 + 96739b6 + e1b5376 + 1c7183f + 0e68ed1 + 5b3198f + 929c939 + f7e2963 + 611c83e + 1d9e7ae + eae64aa + 1f3f9e7 + b2d7401 + 2f1d9d3 + de6b908 + c73007c + 9565c63 + bc2a6d0 + 264d24f + c9c493c + 3992e0d + 5225965 + 0de9a5c + 867db21 + 34fe2aa + 6ec2723 + e576e38 + cbc0283 + d007f6e + db4f03e + f8f7897 + 4cb349f + f5287db + e7abf4a + b1e5a28 + 6c77a16 + d3f730c + 9abb387 + c0b8c0d + f8bc057 + 4f32b4b + aa46231 + 52390dd + aed5127 + d6219ab + cc8aa50 + 3796880 + 3460327 + 6371934 + bdc1874 + 540ba2f + c5fa53c + c1cd9d0 + e861d7a + bfa4749 + 5ec28c8 + 5078786 + 9d152ef + 3376d96 + 2851abb + 8728f2a + e5443b4 + 6b3466e + 435b7e1 + 3abf077 + 3e7551c + 0af2391 + 60c43e9 + d3bdecf + 7b55dd6 + e705b54 + 6d56b35 + 8383390 + 5642b61 + 85af0e4 + 4bef446 + 1de66d7 + 2cfd916 + 297bb66 + de6c4f3 + c04ecdf + 7bb614c commit b49dbbb
Show file tree
Hide file tree
Showing 9 changed files with 44 additions and 28 deletions.
3 changes: 3 additions & 0 deletions src/ClassFileLocator.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,9 @@ public function accept()
}
$class = (null === $namespace) ? $content : $namespace . '\\' . $content;
$file->addClass($class);
if ($namespace) {
$file->addNamespace($namespace);
}
$namespace = null;
break;
}
Expand Down
34 changes: 32 additions & 2 deletions src/PhpClassFile.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,12 @@ class PhpClassFile extends SplFileInfo
/**
* @var array
*/
protected $classes;
protected $classes = array();

/**
* @var array
*/
protected $namespaces = array();

/**
* Get classes
Expand All @@ -31,15 +36,40 @@ public function getClasses()
return $this->classes;
}

/**
* Get namespaces
*
* @return array
*/
public function getNamespaces()
{
return $this->namespaces;
}

/**
* Add class
*
* @param string $class
* @return PhpClassFile
* @return self
*/
public function addClass($class)
{
$this->classes[] = $class;
return $this;
}

/**
* Add namespace
*
* @param string $namespace
* @return self
*/
public function addNamespace($namespace)
{
if (in_array($namespace, $this->namespaces)) {
return $this;
}
$this->namespaces[] = $namespace;
return $this;
}
}
13 changes: 9 additions & 4 deletions test/ClassFileLocatorTest.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_File
*/

namespace ZendTest\File;
Expand All @@ -15,9 +14,6 @@
/**
* Test class for Zend\File\ClassFileLocator
*
* @category Zend
* @package Zend_File
* @subpackage UnitTests
* @group Zend_File
*/
class ClassFileLocatorTest extends \PHPUnit_Framework_TestCase
Expand Down Expand Up @@ -83,6 +79,15 @@ public function testIterationShouldInjectNamespaceInFoundItems()
$this->assertTrue($found);
}

public function testIterationShouldInjectNamespacesInFileInfo()
{
$locator = new ClassFileLocator(__DIR__);
foreach ($locator as $file) {
$namespaces = $file->getNamespaces();
$this->assertTrue(count($namespaces) > 0);
}
}

public function testIterationShouldInjectClassInFoundItems()
{
$locator = new ClassFileLocator(__DIR__);
Expand Down
5 changes: 0 additions & 5 deletions test/TestAsset/LocatorShouldFindThis.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +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_File
*/

namespace ZendTest\File\TestAsset;

/**
* @package Zend_Loader
* @subpackage Exception
*/
interface LocatorShouldFindThis
{
}
1 change: 0 additions & 1 deletion test/TestAsset/MultipleClassesInMultipleNamespaces.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_File
*/

namespace ZendTest\File\TestAsset
Expand Down
4 changes: 0 additions & 4 deletions test/Transfer/Adapter/AbstractAdapterTestMockAdapter.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_File
*/

namespace ZendTest\File\Transfer\Adapter;
Expand All @@ -15,9 +14,6 @@
/**
* Test class for Zend\File\Transfer\Adapter\AbstractAdapter
*
* @category Zend
* @package Zend_File
* @subpackage UnitTests
* @group Zend_File
*/
class AbstractAdapterTestMockAdapter extends Adapter\AbstractAdapter
Expand Down
4 changes: 0 additions & 4 deletions test/Transfer/Adapter/AbstractTest.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_File
*/

namespace ZendTest\File\Transfer\Adapter;
Expand All @@ -20,9 +19,6 @@
/**
* Test class for Zend\File\Transfer\Adapter\AbstractAdapter
*
* @category Zend
* @package Zend_File
* @subpackage UnitTests
* @group Zend_File
*/
class AbstractTest extends \PHPUnit_Framework_TestCase
Expand Down
4 changes: 0 additions & 4 deletions test/Transfer/Adapter/HttpTest.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_File
*/

namespace ZendTest\File\Transfer\Adapter;
Expand All @@ -19,9 +18,6 @@
/**
* Test class for Zend\File\Transfer\Adapter\Http
*
* @category Zend
* @package Zend_File
* @subpackage UnitTests
* @group Zend_File
*/
class HttpTest extends \PHPUnit_Framework_TestCase
Expand Down
4 changes: 0 additions & 4 deletions test/Transfer/Adapter/HttpTestMockAdapter.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_File
*/

namespace ZendTest\File\Transfer\Adapter;
Expand All @@ -15,9 +14,6 @@
/**
* Test class for Zend\File\Transfer\Adapter\AbstractAdapter
*
* @category Zend
* @package Zend_File
* @subpackage UnitTests
* @group Zend_File
*/
class HttpTestMockAdapter extends Adapter\Http
Expand Down

0 comments on commit b49dbbb

Please sign in to comment.