introduce Formal BEAR as the base framework

iteman · iteman · commit 32b3d3278184 · 2014-07-20T21:33:31.000+09:00
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+/app/config/parameters.yml
 /composer.lock
 /var/log/*
 !/var/log/.placefolder
diff --git a/app/config/config.yml b/app/config/config.yml
@@ -0,0 +1,6 @@
+imports:
+  - parameters.yml
+
+framework:
+  named_constants:
+  signal_parameters:
diff --git a/app/config/config_api.yml b/app/config/config_api.yml
@@ -0,0 +1,2 @@
+imports:
+  - config.yml
diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml
@@ -0,0 +1,2 @@
+imports:
+  - config.yml
diff --git a/app/config/config_prod.yml b/app/config/config_prod.yml
@@ -0,0 +1,2 @@
+imports:
+  - config.yml
diff --git a/app/config/config_test.yml b/app/config/config_test.yml
@@ -0,0 +1,2 @@
+imports:
+  - config_dev.yml
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
@@ -0,0 +1 @@
+parameters:
diff --git a/composer.json b/composer.json
@@ -14,10 +14,7 @@
     "prefer-stable": true,
     "require": {
         "php": ">=5.4.0",
-        "bear/package": "dev-develop",
-        "bear/resource": "*",
-        "bear/sunday": "*",
-        "ray/di": "*"
+        "phpmentors/formal-bear": "~1.0"
     },
     "require-dev": {
         "bear/dev-package": "~0.2",
diff --git a/src/Module/App/Aspect.php b/src/Module/App/Aspect.php
@@ -2,7 +2,6 @@
 
 namespace PHPMentors\DomainCoder\Module\App;
 
-use BEAR\Package;
 use Ray\Di\AbstractModule;
 
 class Aspect extends AbstractModule
diff --git a/src/Module/App/Dependency.php b/src/Module/App/Dependency.php
@@ -2,9 +2,7 @@
 
 namespace PHPMentors\DomainCoder\Module\App;
 
-use BEAR\Package;
 use Ray\Di\AbstractModule;
-use Ray\Di\Injector;
 
 class Dependency extends AbstractModule
 {
diff --git a/src/Module/AppModule.php b/src/Module/AppModule.php
@@ -1,13 +1,34 @@
 <?php
+/*
+ * Copyright (c) 2014 KUBO Atsuhiro <kubo@iteman.jp>,
+ * All rights reserved.
+ *
+ * This file is part of Domain Coder.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 namespace PHPMentors\DomainCoder\Module;
 
-use BEAR\Package\Module\Package\StandardPackageModule;
-use Ray\Di\AbstractModule;
+use BEAR\Package\Provide\TemplateEngine\Twig\TwigModule;
+use PHPMentors\FormalBEAR\Config\ConfigReader;
+use PHPMentors\FormalBEAR\Module\EntryModule;
+use PHPMentors\FormalBEAR\Module\FrameworkModule;
 use Ray\Di\Di\Inject;
 use Ray\Di\Di\Named;
 
-class AppModule extends AbstractModule
+class AppModule extends EntryModule
 {
     /**
      * @var string
@@ -27,21 +48,19 @@ public function __construct($context = 'prod')
     }
 
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     protected function configure()
     {
-        $this->install(new StandardPackageModule('PHPMentors\DomainCoder', $this->context, dirname(dirname(__DIR__))));
-
-        // override module
-        // $this->install(new SmartyModule($this));
-
-        // $this->install(new AuraViewModule($this));
-
-        // install application dependency
-        // $this->install(new App\Dependency);
+        $this->install(new FrameworkModule($this, 'PHPMentors\DomainCoder', $this->context, dirname(dirname(__DIR__))));
+        $this->install(new TwigModule($this));
+    }
 
-        // install application aspect
-        // $this->install(new App\Aspect($this));
+    /**
+     * {@inheritDoc}
+     */
+    protected function readConfig(ConfigReader $configReader)
+    {
+        return $configReader->read(dirname(dirname(__DIR__)) . '/app/config/config_' . $this->context. '.yml');
     }
 }
diff --git a/var/conf/constants.php b/var/conf/constants.php
diff --git a/var/conf/db/mysql.php b/var/conf/db/mysql.php
diff --git a/var/conf/db/sqlite.php b/var/conf/db/sqlite.php
diff --git a/var/conf/params.php b/var/conf/params.php

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+/app/config/parameters.yml`
`1`	`2`	`/composer.lock`
`2`	`3`	`/var/log/*`
`3`	`4`	`!/var/log/.placefolder`
Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace PHPMentors\DomainCoder\Module\App;`
`4`	`4`
`5`		`-use BEAR\Package;`
`6`	`5`	`use Ray\Di\AbstractModule;`
`7`		`-use Ray\Di\Injector;`
`8`	`6`
`9`	`7`	`class Dependency extends AbstractModule`
`10`	`8`	`{`