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

Commit

Permalink
Merge branch 'hotfix/4978'
Browse files Browse the repository at this point in the history 
Close zendframework/zendframework#4978
  • Loading branch information
@weierophinney
weierophinney committed Aug 19, 2013
107 parents cf6ac15 + 8482bcb + 41f8677 + 3922c9c + d6d9612 + 4205ad6 + 4b5508c + 157b3a0 + d13dd3d + 8d69039 + c5a2e5b + 1ff4f12 + 8283194 + 854c22d + abc22a4 + af60021 + 5154393 + a82f1c3 + 0c01d9c + 5db3cd1 + 20586e0 + 2676bb2 + 9b81e96 + a26822a + 954b79b + 3c40dd7 + c18f322 + 7427dc0 + 320a9ea + 87098a5 + 2ab5cd1 + a18ab98 + 1c268a7 + 3bd0f91 + e286a21 + 4feaafa + e924eaa + 8dd3ce8 + 4e1e408 + 89b12e3 + c670ac1 + 00d03bb + bd91a55 + 2d86845 + 1694b28 + b36e3e8 + f10ca90 + b37dc0b + a729860 + a4b177e + 5e10b10 + 0db5f75 + bcb7bb1 + f7074c9 + 7529e8f + ba3a8b2 + 76de94f + 6b68a23 + 0b35e2c + c983de4 + 96e1faf + da74c7f + c2aff03 + a05cd2c + c2d82ed + a13730b + 6259074 + 11e375c + ee842b2 + c71c199 + 93b7dbd + 0b6c63f + a97fc11 + c64933f + 547a1fc + a0774d3 + c14420a + 180495b + 4f1bc09 + b1f9102 + d5f0d56 + 196c531 + 9f62e1a + 0a6a6fe + 29d5636 + 57d6216 + ea58a7d + d3a81cf + bd7aa50 + 4611daf + 45cfa56 + 63f8588 + d7057b3 + c22bfe9 + 9b75cec + f716062 + 3afdd4f + 03ff13f + b4a5752 + e60700e + 1664cc7 + ba39dc6 + 26a7c2f + 09e7fc0 + c151903 + 5956f4c + 9dbb629 commit 0aa03b8
Show file tree
Hide file tree
Showing 7 changed files with 49 additions and 0 deletions.
7 changes: 7 additions & 0 deletions test/_files/Baz/Module.php
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
<?php
/**
* Zend Framework (http://framework.zend.com/)
*
* @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
*/

namespace Baz;

Expand Down
7 changes: 7 additions & 0 deletions test/_files/Baz/src/Baz/Controller/IndexController.php
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
<?php
/**
* Zend Framework (http://framework.zend.com/)
*
* @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
*/

namespace Baz\Controller;

Expand Down
7 changes: 7 additions & 0 deletions test/_files/ModuleWithEvents/Module.php
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
<?php
/**
* Zend Framework (http://framework.zend.com/)
*
* @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
*/

namespace ModuleWithEvents;

Expand Down
7 changes: 7 additions & 0 deletions test/_files/modules-path/with-subdir/Bar/Module.php
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
<?php
/**
* Zend Framework (http://framework.zend.com/)
*
* @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
*/

namespace Bar;

Expand Down
7 changes: 7 additions & 0 deletions test/_files/modules-path/with-subdir/Bar/src/Bar/Controller/IndexController.php
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
<?php
/**
* Zend Framework (http://framework.zend.com/)
*
* @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
*/

namespace Bar\Controller;

Expand Down
7 changes: 7 additions & 0 deletions test/_files/modules-path/with-subdir/Foo/Module.php
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
<?php
/**
* Zend Framework (http://framework.zend.com/)
*
* @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
*/

namespace Foo;

Expand Down
7 changes: 7 additions & 0 deletions test/_files/modules-path/with-subdir/Foo/src/Foo/Controller/IndexController.php
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
<?php
/**
* Zend Framework (http://framework.zend.com/)
*
* @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
*/

namespace Foo\Controller;

Expand Down

0 comments on commit 0aa03b8

Please # to comment.