upgrade stubbles/core to ~3.0

stubbles · May 1, 2013 · 95da8e6 · 95da8e6
1 parent ee6871e
commit 95da8e6
Show file tree

Hide file tree

Showing 28 changed files with 522 additions and 121 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,4 +10,4 @@ before_script:
   - cp .travis.composer.config.json ~/.composer/config.json
   - composer install --dev
 
-script: phpunit --coverage-text
+script: vendor/bin/phpunit --coverage-text
diff --git a/CHANGES b/CHANGES
@@ -1,6 +1,6 @@
-2.?.?, ???
+2.2.?, 2013-??-??
 ==================
-- change dependency to stubbles-core from 2.* to ~2.1
+- upgraded stubbles/core to ~3.0
 
 
 2.1.0, 2012-07-31

diff --git a/cache/.gitignore b/cache/.gitignore
diff --git a/composer.json b/composer.json
@@ -6,18 +6,22 @@
     "description": "Stubbles Log provides support for writing log data.",
     "require": {
         "php": ">=5.3.0",
-        "stubbles/core": "~2.1"
+        "stubbles/core": "~3.0"
     },
     "require-dev": {
-        "mikey179/vfsStream": "~1.1"
+        "mikey179/vfsStream": "~1.2",
+        "phpunit/phpunit": "~3.7"
     },
     "autoload": {
         "psr-0": {
             "net\\stubbles\\log": "src/main/php"
         }
     },
-    "scripts": {
-        "post-install-cmd": "org\\stubbles\\scripts\\ComposerScripts::postInstall",
-        "post-update-cmd": "org\\stubbles\\scripts\\ComposerScripts::postUpdate"
-    }
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.2.x-dev"
+        }
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
 }