Merge pull request #12 from myplanetdigital/GH-12-phpunit-pear-warning

Moved to using phpunit cookbook fork that resolves pear error during initial chef run.
oriuminc · Sep 14, 2012 · 4c95542 · 4c95542
2 parents ab21f43 + 25a3666
commit 4c95542
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/Cheffile b/Cheffile
@@ -25,8 +25,8 @@ cookbook "phpcs",
   :git => "https://github.com/myplanetdigital/chef-phpcs.git",
   :ref => "master"
 cookbook "phpunit",
-  :git => "https://github.com/msonnabaum/chef-phpunit.git",
-  :ref => "master"
+  :git => "https://github.com/myplanetdigital/chef-phpunit.git",
+  :ref => "GH-9-pear-errors"
 cookbook "postfix"
 cookbook "varnish"
 cookbook "vim"

diff --git a/Cheffile.lock b/Cheffile.lock
@@ -31,14 +31,6 @@ GIT
     drush (0.10.0)
       php (>= 0.0.0)
 
-GIT
-  remote: https://github.com/msonnabaum/chef-phpunit.git
-  ref: master
-  sha: 8379017c52c8187a53711286df1f4560b16eea20
-  specs:
-    phpunit (0.9.1)
-      php (>= 0.0.0)
-
 GIT
   remote: https://github.com/myplanetdigital/chef-bash.git
   ref: feature/bash_profile-resource
@@ -71,6 +63,14 @@ GIT
     phpcs (1.0.0)
       php (>= 0.0.0)
 
+GIT
+  remote: https://github.com/myplanetdigital/chef-phpunit.git
+  ref: GH-9-pear-errors
+  sha: e215dab712d0a4fb946b173c2b089688a8c7d617
+  specs:
+    phpunit (0.9.1)
+      php (>= 0.0.0)
+
 GIT
   remote: https://github.com/myplanetdigital/chef-xhprof.git
   ref: GH-msonnabaum-3