Permalink
Browse files

Added composer support and moved internal dependencies to composer

  • Loading branch information...
1 parent 870fe60 commit a5638b852cd4197fed4948d69e2c546b7e02850d @mvriel mvriel committed Apr 5, 2012
Showing with 193 additions and 7,756 deletions.
  1. +1 −0 .gitignore
  2. +1 −3 bin/phpdoc.php
  3. +28 −0 composer.json
  4. +25 −0 composer.lock
  5. +0 −5 src/Zend/Config/Exception.php
  6. +4 −11 src/Zend/Config/Ini.php
  7. +17 −22 src/Zend/Config/Writer/Array.php
  8. +23 −28 src/Zend/Config/Writer/Ini.php
  9. +28 −33 src/Zend/Config/Writer/Xml.php
  10. +0 −5 src/Zend/Config/Xml.php
  11. +0 −7 src/Zend/Console/Getopt/Exception.php
  12. +0 −17 src/Zend/Locale.php
  13. +0 −5 src/Zend/Locale/Data.php
  14. +0 −6 src/Zend/Locale/Exception.php
  15. +0 −5 src/Zend/Locale/Format.php
  16. +0 −6 src/Zend/Locale/Math/Exception.php
  17. +0 −3 src/Zend/Log/Exception.php
  18. +2 −8 src/Zend/Log/Filter/Abstract.php
  19. +2 −5 src/Zend/Log/Filter/Message.php
  20. +4 −7 src/Zend/Log/Filter/Priority.php
  21. +1 −4 src/Zend/Log/Filter/Suppress.php
  22. +0 −3 src/Zend/Log/Formatter/Firebug.php
  23. +0 −3 src/Zend/Log/Formatter/Simple.php
  24. +0 −3 src/Zend/Log/Formatter/Xml.php
  25. +1 −4 src/Zend/Log/Writer/Abstract.php
  26. +5 −8 src/Zend/Log/Writer/Db.php
  27. +2 −11 src/Zend/Log/Writer/Mail.php
  28. +2 −5 src/Zend/Log/Writer/Mock.php
  29. +2 −5 src/Zend/Log/Writer/Null.php
  30. +7 −13 src/Zend/Log/Writer/Stream.php
  31. +2 −5 src/Zend/Log/Writer/Syslog.php
  32. +4 −7 src/Zend/Log/Writer/ZendMonitor.php
  33. +1 −11 src/Zend/Translate/Adapter.php
  34. +0 −8 src/Zend/Translate/Adapter/Array.php
  35. +0 −7 src/Zend/Translate/Exception.php
  36. +0 −154 src/ZendX/File/ClassFileLocator.php
  37. +0 −131 src/ZendX/Loader/AutoloaderFactory.php
  38. +0 −190 src/ZendX/Loader/ClassMapAutoloader.php
  39. +0 −73 src/ZendX/Loader/SplAutoloader.php
  40. +0 −332 src/ZendX/Loader/StandardAutoloader.php
  41. +0 −2,932 src/markdown.php
  42. +0 −36 src/markdown/License.text
  43. +0 −786 src/markdown/PHP Markdown Extra Readme.text
  44. +2 −24 src/phpDocumentor/Bootstrap.php
  45. +0 −2 src/phpDocumentor/Parser/Abstract.php
  46. +2 −2 src/phpDocumentor/Plugin.php
  47. +2 −1 src/phpDocumentor/Plugin/Core/Transformer/Behaviour/Tag/Param.php
  48. +3 −2 src/phpDocumentor/Reflection/DocBlock/LongDescription.php
  49. +0 −19 src/symfony/components/event_dispatcher/LICENSE
  50. +0 −8 src/symfony/components/event_dispatcher/README.markdown
  51. +0 −120 src/symfony/components/event_dispatcher/doc/00-Introduction.markdown
  52. +0 −209 src/symfony/components/event_dispatcher/doc/01-Event-Dispatcher.markdown
  53. +0 −190 src/symfony/components/event_dispatcher/doc/02-Recipes.markdown
  54. +0 −108 src/symfony/components/event_dispatcher/doc/A-License.markdown
  55. +0 −162 src/symfony/components/event_dispatcher/lib/sfEvent.php
  56. +0 −159 src/symfony/components/event_dispatcher/lib/sfEventDispatcher.php
  57. +0 −68 src/symfony/components/event_dispatcher/package.xml
  58. +0 −37 src/symfony/components/event_dispatcher/test/bin/coverage.php
  59. +0 −27 src/symfony/components/event_dispatcher/test/bin/prove.php
  60. +0 −1,500 src/symfony/components/event_dispatcher/test/lime/lime.php
  61. +0 −133 src/symfony/components/event_dispatcher/test/unit/sfEventDispatcherTest.php
  62. +0 −62 src/symfony/components/event_dispatcher/test/unit/sfEventTest.php
  63. +2 −9 tests/common/bootstrap.php
  64. +17 −4 tests/unit/phpDocumentor/Parser/AbstractTest.php
  65. +3 −3 tests/unit/phpDocumentor/Reflection/DocBlockTest.php
View
@@ -5,3 +5,4 @@ build/*
.project
.settings/
*.swp
+vendor/*
View
@@ -32,8 +32,6 @@
require($bootstrap_folder . '/phpDocumentor/Bootstrap.php');
-$autoloader = phpDocumentor_Bootstrap::createInstance()->registerAutoloader();
-
$task_name = ($_SERVER['argc'] == 1) ? false : $_SERVER['argv'][1];
$runner = new phpDocumentor_Task_Runner($task_name, 'project:run');
$task = $runner->getTask();
@@ -49,7 +47,7 @@
// the plugins are registered here because the phpDocumentor_Task can load a
// custom configuration; which is needed by this registration
-phpDocumentor_Bootstrap::createInstance()->registerPlugins($autoloader);
+phpDocumentor_Bootstrap::createInstance()->registerPlugins(null);
try {
$task->execute();
View
@@ -0,0 +1,28 @@
+{
+ "name":"phpdocumentor/phpdocumentor",
+ "license":"MIT",
+ "autoload":{
+ "psr-0":{
+ "phpDocumentor":"src/",
+ "Zend":"src/"
+ },
+ "classmap":["vendor/pear-symfony"]
+ },
+ "repositories":[
+ {
+ "type":"pear",
+ "url":"http://packages.zendframework.com"
+ }
+ ],
+ "repositories":[
+ {
+ "type":"pear",
+ "url":"http://pear.symfony-project.com/"
+ }
+ ],
+ "require":{
+ "monolog/monolog":"1.0.*",
+ "dflydev/markdown":"1.0.*",
+ "pear-symfony/EventDispatcher": "1.*"
+ }
+}
View

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -20,11 +20,6 @@
*/
/**
- * @see Zend_Exception
- */
-require_once 'Zend/Exception.php';
-
-/**
* @category Zend
* @package Zend_Config
* @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
View
@@ -19,13 +19,6 @@
* @version $Id: Ini.php 16201 2009-06-21 18:51:15Z thomas $
*/
-
-/**
- * @see Zend_Config
- */
-require_once 'Zend/Config.php';
-
-
/**
* @category Zend
* @package Zend_Config
@@ -54,7 +47,7 @@ class Zend_Config_Ini extends Zend_Config
* @var boolean
*/
protected $_skipExtends = false;
-
+
/**
* Loads the section $section from the config file $filename for
* access facilitated by nested object properties.
@@ -153,7 +146,7 @@ public function __construct($filename, $section = null, $options = false)
}
parent::__construct($dataArray, $allowModifications);
- }
+ }
$this->_loadedSection = $section;
}
@@ -210,7 +203,7 @@ protected function _loadIniFile($filename)
return $iniArray;
}
-
+
/**
* Process each element in the section and handle the ";extends" inheritance
* key. Passes control to _processKey() to handle the nest separator
@@ -230,7 +223,7 @@ protected function _processSection($iniArray, $section, $config = array())
if (strtolower($key) == ';extends') {
if (isset($iniArray[$value])) {
$this->_assertValidExtend($section, $value);
-
+
if (!$this->_skipExtends) {
$config = $this->_processSection($iniArray, $value, $config);
}
@@ -20,11 +20,6 @@
*/
/**
- * @see Zend_Config_Writer
- */
-require_once 'Zend/Config/Writer.php';
-
-/**
* @category Zend
* @package Zend_Config
* @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
@@ -38,14 +33,14 @@ class Zend_Config_Writer_Array extends Zend_Config_Writer
* @var string
*/
protected $_filename = null;
-
+
/**
* Wether to exclusively lock the file or not
*
* @var boolean
*/
protected $_exclusiveLock = false;
-
+
/**
* Set the target filename
*
@@ -55,10 +50,10 @@ class Zend_Config_Writer_Array extends Zend_Config_Writer
public function setFilename($filename)
{
$this->_filename = $filename;
-
+
return $this;
}
-
+
/**
* Set wether to exclusively lock the file or not
*
@@ -68,10 +63,10 @@ public function setFilename($filename)
public function setExclusiveLock($exclusiveLock)
{
$this->_exclusiveLock = $exclusiveLock;
-
+
return $this;
}
-
+
/**
* Defined by Zend_Config_Writer
*
@@ -87,43 +82,43 @@ public function write($filename = null, Zend_Config $config = null, $exclusiveLo
if ($filename !== null) {
$this->setFilename($filename);
}
-
+
if ($config !== null) {
$this->setConfig($config);
}
-
+
if ($exclusiveLock !== null) {
$this->setExclusiveLock($exclusiveLock);
}
-
+
if ($this->_filename === null) {
require_once 'Zend/Config/Exception.php';
throw new Zend_Config_Exception('No filename was set');
}
-
+
if ($this->_config === null) {
require_once 'Zend/Config/Exception.php';
throw new Zend_Config_Exception('No config was set');
}
-
+
$data = $this->_config->toArray();
$sectionName = $this->_config->getSectionName();
-
+
if (is_string($sectionName)) {
$data = array($sectionName => $data);
}
-
+
$arrayString = "<?php\n"
. "return " . var_export($data, true) . ";\n";
-
+
$flags = 0;
-
+
if ($this->_exclusiveLock) {
$flags |= LOCK_EX;
}
-
+
$result = @file_put_contents($this->_filename, $arrayString, $flags);
-
+
if ($result === false) {
require_once 'Zend/Config/Exception.php';
throw new Zend_Config_Exception('Could not write to file "' . $this->_filename . '"');
Oops, something went wrong.

0 comments on commit a5638b8

Please sign in to comment.