Permalink
Browse files

Fix bit rot after a short hiatus

The composer file was out of date and terribly out of date at that. As such
I have updated it to match the new Composer format. I have also updated the
composer.json with the latest formatting and bumped the version number to
5.3.2 as required by the Symfony Components due to a critical bug in PHP
5.3.2.

UIn addition the compile script was moved to a 'bin' folder to make it
clearer that this is a binary.
  • Loading branch information...
1 parent dc46d2d commit 99f48a14d8006545e69438500ada33ea9282d07c @mvriel mvriel committed Nov 21, 2012
Showing with 193 additions and 34 deletions.
  1. +1 −1 README.md
  2. +1 −1 { → bin}/compile
  3. +10 −17 composer.json
  4. +181 −15 composer.lock
View
@@ -13,7 +13,7 @@ $app->command(new \Cilex\Command\GreetCommand());
$app->run();
```
-Cilex works with PHP 5.3.2 or later and is heavily inspired on the [Silex][2]
+Cilex works with PHP 5.3.3 or later and is heavily inspired on the [Silex][2]
web micro-framework by Fabien Potencier.
## Installation
View
@@ -1,6 +1,6 @@
#!/usr/bin/env php
<?php
-$autoload = __DIR__ . '/vendor/autoload.php';
+$autoload = __DIR__ . '/../vendor/autoload.php';
if (!file_exists($autoload)) {
echo "Please run `php composer.phar install` first." . PHP_EOL;
exit(1);
View
@@ -4,18 +4,18 @@
"keywords": ["microframework","cli"],
"homepage": "http://cilex.github.com",
"license": "MIT",
+ "autoload":{
+ "psr-0":{ "Cilex": "src/" }
+ },
"authors":[
- {
- "name": "Mike van Riel",
- "email": "mike.vanriel@naenius.com"
- }
+ { "name": "Mike van Riel", "email": "mike.vanriel@naenius.com" }
],
"require":{
- "php": ">=5.3.2",
- "pimple/pimple": "1.0.*",
- "symfony/console": "2.1.*",
- "symfony/process": "2.1.*",
- "symfony/finder": "2.1.*"
+ "php": ">=5.3.3",
+ "pimple/pimple": "1.0.*",
+ "symfony/console": "2.1.*",
+ "symfony/process": "2.1.*",
+ "symfony/finder": "2.1.*"
},
"require-dev":{
"symfony/validator": "2.1.*"
@@ -25,14 +25,7 @@
"symfony/yaml": ">=1.0.0",
"symfony/validator": ">=1.0.0"
},
- "autoload":{
- "psr-0":{
- "Cilex": "src/"
- }
- },
"extra":{
- "branch-alias":{
- "dev-master": "1.0-dev"
- }
+ "branch-alias": { "dev-master": "1.0-dev" }
}
}
View

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

0 comments on commit 99f48a1

Please sign in to comment.