Merge 573fdc9 into b03b54a

.gitignore

@@ -7,3 +7,6 @@
 /tests/tmp/*
 .DS_Store
 Thumbs.db
+.tags
+.tags_sorted_by_file
+._*

.snippets

@@ -0,0 +1,5 @@
+altax
+ * [altax] sudo ln -s `pwd`/bin/altax /usr/local/bin/altax
+ * [altax] php vendor/bin/phpunit
+ * [altax] php vendor/bin/php-cs-fixer fix src
+ * [altax] php vendor/bin/phpunit tests/e2e/E2eTest.php

.travis.yml

@@ -1,9 +1,9 @@
 language: php
 
 php:
-  - 5.3
   - 5.4
   - 5.5
+  - 5.6
 
 before_script:
   - composer install --dev --no-interaction

README.md

@@ -60,7 +60,9 @@ You can get more information at [http://kohkimakimoto.github.io/altax/](http://k
 
 ## Requirement
 
-PHP5.3 or later.
+PHP5.4 or later.
+
+(Altax version 3.x requires PHP5.3 later)
 
 ## Installation
 

bin/altax

@@ -1,7 +1,19 @@
 #!/usr/bin/env php
 <?php
 
+require_once __DIR__.'/../vendor/autoload.php';
 
+$app = bootAltaxApplication(array(
+    getenv("HOME")."/.altax/config.php",
+    getcwd()."/.altax/config.php",
+    ));
+$cli = new \Altax\Console\Application($app);
+$cli->run();
+
+
+
+
+/*
 if (PHP_SAPI !== 'cli') {
     echo 'Warning: Altax should be invoked via the CLI version of PHP, not the '.PHP_SAPI.' SAPI'.PHP_EOL;
 }
@@ -56,3 +68,4 @@ $container = require_once __DIR__.'/../src/Altax/Foundation/boot.php';
 
 $app = new \Altax\Console\Application($container);
 $app->run();
+*/

composer.json

@@ -11,33 +11,42 @@
     }
   ],
   "require": {
-    "php": ">=5.3.0",
+    "php": ">=5.4.0",
     "composer/composer": "1.0.*@dev",
+    "symfony/process": "2.5.*",
     "symfony/console": "2.5.*",
     "symfony/filesystem": "2.5.*",
     "symfony/yaml": "2.5.*",
     "symfony/finder": "2.5.*",
-    "symfony/process": "2.5.*",
+    "illuminate/container": "4.*",
+    "illuminate/support": "4.*",
+    "illuminate/config": "4.*",
+    "illuminate/events": "4.*",
     "phpseclib/phpseclib": "0.3.*"
   },
+  "require-dev": {
+    "phpunit/phpunit": "4.*",
+    "mockery/mockery": "~0.9",
+    "fabpot/php-cs-fixer": "@stable",
+    "satooshi/php-coveralls": "dev-master"
+  },
   "scripts": {
     "post-install-cmd": [
-      "Altax\\Script\\ScriptHandler::removeAutoloadFiles"
+      "Altax\\ComposerScript\\ScriptHandler::removeAutoloadFiles"
     ],
     "post-update-cmd": [
-      "Altax\\Script\\ScriptHandler::removeAutoloadFiles"
+      "Altax\\ComposerScript\\ScriptHandler::removeAutoloadFiles"
     ]
   },
-  "require-dev": {
-    "phpunit/phpunit": "3.*",
-    "satooshi/php-coveralls": "dev-master"
-  },
   "autoload": {
+    "files": [
+        "src/Altax/Foundation/functions.php"
+    ],
     "psr-0": { "Altax\\": "src/"}
   },
   "extra": {
       "branch-alias": {
-          "dev-master": "3.0.x-dev"
+          "dev-master": "3.1.x-dev"
       }
   },
   "bin": ["bin/altax"]