switched to PSR-4 autoloading and fixed tests

jhannka · Jan 19, 2015 · 8597888 · 8597888
1 parent b51aa32
commit 8597888
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 38 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,2 @@
-nbproject/
-Tests/temp/*
+composer.lock
+vendor/*
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,4 @@
 language: php
-
 php:
   - 5.3
   - 5.4
@@ -8,6 +7,6 @@ php:
   - hhvm
 
 before_script:
-  - composer update --dev
+  - composer install --dev
 
 script: phpunit
diff --git a/Tests/bootstrap.php b/Tests/bootstrap.php
diff --git a/composer.json b/composer.json
@@ -5,7 +5,6 @@
     "keywords": ["pager", "paginator", "pagination", "symfony2", "bundle", "knp", "knplabs"],
     "homepage": "http://github.com/KnpLabs/KnpPaginatorBundle",
     "license": "MIT",
-
     "authors": [
         {
             "name": "KnpLabs Team",
@@ -16,22 +15,20 @@
             "homepage": "http://github.com/KnpLabs/KnpPaginatorBundle/contributors"
         }
     ],
-
     "require": {
         "php":                      ">=5.3.3",
         "symfony/framework-bundle": "~2.0",
         "knplabs/knp-components":   "~1.2",
         "twig/twig":                "~1.5"
     },
-
+    "require-dev": {
+      "symfony/expression-language": "~2.4"
+    },
     "autoload": {
-        "psr-0": {
-            "Knp\\Bundle\\PaginatorBundle": ""
+        "psr-4": {
+            "Knp\\Bundle\\PaginatorBundle\\": ""
         }
     },
-
-    "target-dir": "Knp/Bundle/PaginatorBundle",
-
     "extra": {
         "branch-alias": {
             "dev-master": "2.4.x-dev"

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,17 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         syntaxCheck="false"
-        >
+
+<phpunit colors="false" bootstrap="vendor/autoload.php">
     <testsuites>
-        <testsuite name="Knp Paginator Bundle">
-            <directory suffix=".php">Tests</directory>
+        <testsuite name="KnpPaginatorBundle Test Suite">
+            <directory suffix="Test.php">./Tests/</directory>
         </testsuite>
     </testsuites>
 </phpunit>