forked from zendframework/zendframework
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'zf2/master' into feature/doc
- Loading branch information
Showing
6,640 changed files
with
50,274 additions
and
713,292 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,11 @@ | ||
| #!/usr/bin/env php | ||
| <?php | ||
| /** | ||
| * Zend Framework | ||
| * Zend Framework (http://framework.zend.com/) | ||
| * | ||
| * LICENSE | ||
| * | ||
| * This source file is subject to the new BSD license that is bundled | ||
| * with this package in the file LICENSE.txt. | ||
| * It is also available through the world-wide-web at this URL: | ||
| * http://framework.zend.com/license/new-bsd | ||
| * If you did not receive a copy of the license and are unable to | ||
| * obtain it through the world-wide-web, please send an email | ||
| * to [email protected] so we can send you a copy immediately. | ||
| * | ||
| * @category Zend | ||
| * @package Zend_Loader | ||
| * @subpackage Exception | ||
| * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) | ||
| * @license http://framework.zend.com/license/new-bsd New BSD License | ||
| * @link http://github.com/zendframework/zf2 for the canonical source repository | ||
| * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) | ||
| * @license http://framework.zend.com/license/new-bsd New BSD License | ||
| */ | ||
|
|
||
| use Zend\Console; | ||
|
|
@@ -163,13 +151,14 @@ | |
| // classname => filename, where the filename is relative to the library path | ||
| $map = new stdClass; | ||
| foreach ($l as $file) { | ||
| $namespace = empty($file->namespace) ? '' : $file->namespace . '\\'; | ||
| $filename = str_replace($libraryPath . '/', '', str_replace(DIRECTORY_SEPARATOR, '/', $file->getPath()) . '/' . $file->getFilename()); | ||
|
|
||
| // Add in relative path to library | ||
| $filename = $relativePathForClassmap . $filename; | ||
|
|
||
| $map->{$namespace . $file->classname} = $filename; | ||
| foreach ($file->getClasses() as $class) { | ||
| $map->{$class} = $filename; | ||
| } | ||
| } | ||
|
|
||
| if ($appending) { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,22 +1,11 @@ | ||
| <?php | ||
| /** | ||
| * Zend Framework | ||
| * Zend Framework (http://framework.zend.com/) | ||
| * | ||
| * LICENSE | ||
| * | ||
| * This source file is subject to the new BSD license that is bundled | ||
| * with this package in the file LICENSE.txt. | ||
| * It is also available through the world-wide-web at this URL: | ||
| * http://framework.zend.com/license/new-bsd | ||
| * If you did not receive a copy of the license and are unable to | ||
| * obtain it through the world-wide-web, please send an email | ||
| * to [email protected] so we can send you a copy immediately. | ||
| * | ||
| * @category Zend | ||
| * @package Zend_Feed | ||
| * @subpackage Demos | ||
| * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) | ||
| * @license http://framework.zend.com/license/new-bsd New BSD License | ||
| * @link http://github.com/zendframework/zf2 for the canonical source repository | ||
| * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) | ||
| * @license http://framework.zend.com/license/new-bsd New BSD License | ||
| * @package Zend_Feed | ||
| */ | ||
|
|
||
| use Zend\Loader\StandardAutoloader; | ||
|
|
@@ -28,14 +17,13 @@ | |
| */ | ||
|
|
||
| require_once dirname(dirname(dirname(__DIR__))).'/library/Zend/Loader/StandardAutoloader.php'; | ||
| $loader = new StandardAutoloader; | ||
| $loader = new StandardAutoloader(array('autoregister_zf' => true)); | ||
| $loader->register(); | ||
|
|
||
|
|
||
| $rss = Reader::import('http://news.google.com/?output=rss'); | ||
|
|
||
| foreach ($rss as $item) { | ||
|
|
||
| echo "<p>" . $item->getTitle() . "<br />", "\n"; | ||
| echo $item->getLink() . "</p>"; | ||
| echo '<p>' . $item->getTitle() . '<br />', "\n"; | ||
| echo $item->getLink() . '</p>'; | ||
| } | ||
This file was deleted.
Oops, something went wrong.
Binary file not shown.
Binary file not shown.
Oops, something went wrong.