Merge pull request marcelog#19 from staelche/change-php4log-src

Changed the log4php requirement source from pear to composer/packagist
marayshi · Mar 21, 2014 · 391d56e · 391d56e
2 parents 803159e + 9408c36
commit 391d56e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 24 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,4 +4,5 @@ vendor
 .project
 build
 resources/php.ini
-
+composer.lock
+nbproject
diff --git a/composer.json b/composer.json
@@ -13,18 +13,13 @@
       "role": "Developer"
     }
   ],
-  "repositories": [
-  {
-    "type": "pear",
-    "url": "http://pear.apache.org/log4php/"
-  }],
   "autoload": {
     "psr-0": {
       "PAGI": "src/mg"
     }
   },
   "require": {
     "php": ">=5.3.3",
-    "pear-log4php/Apache_log4php": ">=2.1.0"
+    "apache/log4php": "2.1.0"
   }
 }
diff --git a/composer.lock b/composer.lock