Merge branch 'dev'

yeaha · May 31, 2016 · 2d07138 · 2d07138
2 parents 337d247 + 7dbe110
commit 2d07138
Show file tree

Hide file tree

Showing 115 changed files with 4 additions and 13,254 deletions.
diff --git a/composer.json b/composer.json
@@ -13,21 +13,12 @@
  ],
  "require": {
  "php": ">=5.6.0",
- "psr/http-message": "^1.0",
- "psr/log": "1.0.0",
- "psr/cache": "1.0.0"
- },
- "require-dev": {
- "phpunit/phpunit": "^5.1.0"
+ "yeaha/owl-core": "1.0.*",
+ "yeaha/owl-mvc": "1.0.*",
+ "yeaha/owl-service": "1.0.*",
+ "yeaha/owl-orm": "1.0.*"
  },
  "suggest": {
  "monolog/monolog": "Allows more advanced logging of the application flow"
- },
- "archive": {
- "exclude": ["/examples", "/tests"]
- },
- "autoload": {
- "psr-4": {"Owl\\": "src"},
- "files": ["src/constant.php", "src/functions.php"]
  }
 }
diff --git a/phpunit.xml b/phpunit.xml
diff --git a/ruleset.xml b/ruleset.xml
diff --git a/src/Application.php b/src/Application.php
diff --git a/src/Config.php b/src/Config.php