fix autoloading from composer, loosen dependency

mayflower · Jan 2, 2014 · 5ad4b49 · brodkin · Mar 26, 2015 · 5ad4b49
1 parent 9554815
commit 5ad4b49
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 9 deletions.
diff --git a/bin/phpcb b/bin/phpcb
@@ -47,7 +47,11 @@
  * @since     File available since  0.1.0
  */
 
-require_once dirname(__FILE__) . '/../vendor/autoload.php';
+if (file_exists(__DIR__ . '/../../autoload.php')) {
+    include_once __DIR__ . '/../../autoload.php';
+} else {
+    include_once __DIR__ . '/../vendor/autoload.php';
+}
 
 $app = new PHPCodeBrowser\Application();
 $app->run();
diff --git a/build.xml b/build.xml
@@ -13,12 +13,12 @@
 
  <!-- Run unit tests and generate junit.xml and clover.xml -->
  <target name="phpunit">
-  <exec executable="phpunit" failonerror="true"/>
+     <exec executable="vendor/bin/phpunit" failonerror="true"/>
  </target>
 
  <!-- Generate jdepend.xml and software metrics charts -->
  <target name="pdepend">
-  <exec executable="pdepend">
+  <exec executable="vendor/bin/pdepend">
    <arg line="--jdepend-xml='${basedir}/build/logs/jdepend.xml'
               --jdepend-chart='${basedir}/build/pdepend/dependencies.svg'
               --overview-pyramid='${basedir}/build/pdepend/overview-pyramid.svg'
@@ -28,21 +28,21 @@
 
  <!-- Generate pmd.xml -->
  <target name="phpmd">
-  <exec executable="phpmd">
+  <exec executable="vendor/bin/phpmd">
    <arg line="src xml codesize,design,naming,unusedcode --reportfile '${basedir}/build/logs/pmd.xml'" />
   </exec>
  </target>
 
  <!-- Generate pmd-cpd.xml -->
  <target name="phpcpd">
-  <exec executable="phpcpd">
+  <exec executable="vendor/bin/phpcpd">
    <arg line="--log-pmd '${basedir}/build/logs/pmd-cpd.xml' src" />
   </exec>
  </target>
 
  <!-- Generate checkstyle.xml -->
  <target name="phpcs">
-  <exec executable="phpcs">
+  <exec executable="vendor/bin/phpcs">
    <arg value="--report=checkstyle" />
    <arg value="--report-file=${basedir}/build/logs/checkstyle.xml" />
    <arg value="--standard=PSR2" />
@@ -72,7 +72,7 @@
    <antcall target="phpmd"/>
    <antcall target="phpcpd"/>
    <antcall target="phpcs"/>
-   <antcall target="phpdoc"/>
+   <!-- <antcall target="phpdoc"/> -->
    <antcall target="phpunit"/>
    <antcall target="phpcb"/>
  </target>

diff --git a/composer.json b/composer.json
@@ -13,10 +13,14 @@
     "require": {
         "phpunit/php-file-iterator": "~1.3",
         "monolog/monolog": "~1.7",
-        "symfony/console": "~2.4"
+        "symfony/console": "~2.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "3.7.*"
+        "phpunit/phpunit": "3.7.*",
+        "phpmd/phpmd": "1.5.*",
+        "squizlabs/php_codesniffer": "1.*",
+        "phploc/phploc": "*",
+        "sebastian/phpcpd": "*"
     },
     "autoload": {
         "psr-0": {"PHPCodeBrowser\\": "src/"}