Merge pull request #12 from citrus-framework/rm_formmap

Rm formmap
citrus-framework · Jul 12, 2020 · 8af03f6 · 8af03f6
2 parents 9646d64 + a6f9964
commit 8af03f6
Show file tree

Hide file tree

Showing 143 changed files with 1,952 additions and 10,363 deletions.
diff --git a/Makefile b/Makefile
@@ -12,16 +12,16 @@ test_all:
 .PHONY: composer_reload
 composer_reload:
 	@composer clear-cache
-	@composer upadte -vvv
+	@composer update -vv
 	@composer dump-autoload
 
 .PHONY: composer_develop
 composer_develop:
-	@composer install -vvv --dev --prefer-dist --optimize-autoloader
+	@composer install -vv --dev --prefer-dist --optimize-autoloader
 
 .PHONY: composer_public
 composer_public:
-	@composer install -vvv --no-dev --prefer-dist --optimize-autoloader
+	@composer install -vv --no-dev --prefer-dist --optimize-autoloader
 
 .PHONY: check
 check:

diff --git a/composer.json b/composer.json
@@ -11,36 +11,30 @@
       "email": "[email protected]"
     }
   ],
-  "bin": [
-    "src/bin/cf-migration",
-    "src/bin/cf-integration"
-  ],
-  "autoload": {
-    "psr-4": {
-      "Citrus\\": "src/",
-      "Test\\": "tests/"
-    }
-  },
   "require": {
-    "smarty/smarty": "^3.1",
-    "aws/aws-sdk-php": "^3.129",
-    "citrus-framework/collection": "^1.0",
     "citrus-framework/configure": "^1.0",
-    "citrus-framework/console": "^1.0",
-    "citrus-framework/database": "^1.0",
+    "citrus-framework/formmap": "^1.0",
     "citrus-framework/http": "^1.0",
-    "citrus-framework/intersection": "^1.0",
     "citrus-framework/logger": "^1.0",
-    "citrus-framework/variables": "^1.0",
-    "ext-dom": "*",
-    "ext-pdo": "*"
+    "citrus-framework/sqlmap": "^1.0",
+    "citrus-framework/variables": "^1.1",
+    "smarty/smarty": "^3.1",
+    "ext-mbstring": "*",
+    "ext-posix": "*",
+    "ext-json": "*",
+    "ext-pdo": "*",
+    "ext-redis": "*",
+    "ext-memcached": "*"
   },
   "require-dev": {
     "php": "^7.3",
     "phpunit/phpunit": "8.4.1",
-    "nunomaduro/phpinsights": "^1.10",
-    "ext-json": "*",
-    "ext-openssl": "*",
-    "ext-posix": "*"
+    "nunomaduro/phpinsights": "^1.10"
+  },
+  "autoload": {
+    "psr-4": {
+      "Citrus\\": "src/",
+      "Test\\": "tests/"
+    }
   }
 }
diff --git a/src/Citrus.class.php → old/src/Citrus.class.php b/src/Citrus.class.php → old/src/Citrus.class.php
diff --git a/src/Configure.class.php → old/src/Configure.class.php b/src/Configure.class.php → old/src/Configure.class.php
@@ -13,7 +13,7 @@
 use Citrus\Configure\Application;
 use Citrus\Configure\ConfigureException;
 use Citrus\Configure\Paths;
-use Citrus\Variable\Directory;
+use Citrus\Variable\Directories;
 
 /**
  * 設定
@@ -102,7 +102,7 @@ public static function directory(string $path_application_dir)
         }
 
         // 親参照指定を取り除く
-        $path_application_dir = Directory::suitablePath($path_application_dir);
+        $path_application_dir = Directories::suitablePath($path_application_dir);
 
         // directory
         self::$DIR_APP = $path_application_dir;

diff --git a/src/Configure/Item.class.php → old/src/Configure/Item.class.php b/src/Configure/Item.class.php → old/src/Configure/Item.class.php
diff --git a/src/FacesService.class.php → old/src/FacesService.class.php b/src/FacesService.class.php → old/src/FacesService.class.php
@@ -10,7 +10,7 @@
 
 namespace Citrus;
 
-use Citrus\Database\Column;
+use Citrus\Database\Columns;
 use Citrus\Database\ResultSet\ResultClass;
 use Citrus\Database\ResultSet\ResultSet;
 use Citrus\Sqlmap\Faces;

diff --git a/src/Integration/Aws/CloudwatchLogs.class.php → .../Integration/Aws/CloudwatchLogs.class.php b/src/Integration/Aws/CloudwatchLogs.class.php → .../Integration/Aws/CloudwatchLogs.class.php
diff --git a/src/Integration/Dmm.class.php → old/src/Integration/Dmm.class.php b/src/Integration/Dmm.class.php → old/src/Integration/Dmm.class.php
diff --git a/src/Integration/Dmm/Actress.class.php → old/src/Integration/Dmm/Actress.class.php b/src/Integration/Dmm/Actress.class.php → old/src/Integration/Dmm/Actress.class.php
diff --git a/src/Integration/Dmm/Condition.class.php → old/src/Integration/Dmm/Condition.class.php b/src/Integration/Dmm/Condition.class.php → old/src/Integration/Dmm/Condition.class.php
diff --git a/src/Integration/Dmm/Floor.enum.php → old/src/Integration/Dmm/Floor.enum.php b/src/Integration/Dmm/Floor.enum.php → old/src/Integration/Dmm/Floor.enum.php
diff --git a/src/Integration/Dmm/Item.class.php → old/src/Integration/Dmm/Item.class.php b/src/Integration/Dmm/Item.class.php → old/src/Integration/Dmm/Item.class.php
diff --git a/src/Integration/Dmm/Service.enum.php → old/src/Integration/Dmm/Service.enum.php b/src/Integration/Dmm/Service.enum.php → old/src/Integration/Dmm/Service.enum.php
diff --git a/src/Integration/Slack.class.php → old/src/Integration/Slack.class.php b/src/Integration/Slack.class.php → old/src/Integration/Slack.class.php
diff --git a/src/Integration/Slack/Attachments.class.php → ...c/Integration/Slack/Attachments.class.php b/src/Integration/Slack/Attachments.class.php → ...c/Integration/Slack/Attachments.class.php
diff --git a/src/Javascript/Extends.js → old/src/Javascript/Extends.js b/src/Javascript/Extends.js → old/src/Javascript/Extends.js
diff --git a/src/Javascript/Faces.js → old/src/Javascript/Faces.js b/src/Javascript/Faces.js → old/src/Javascript/Faces.js
diff --git a/src/Mail/Folder.class.php → old/src/Mail/Folder.class.php b/src/Mail/Folder.class.php → old/src/Mail/Folder.class.php
diff --git a/src/Mail/Folder/Alias.enum.php → old/src/Mail/Folder/Alias.enum.php b/src/Mail/Folder/Alias.enum.php → old/src/Mail/Folder/Alias.enum.php
diff --git a/src/Mail/Header/Item.class.php → old/src/Mail/Header/Item.class.php b/src/Mail/Header/Item.class.php → old/src/Mail/Header/Item.class.php
diff --git a/src/Mail/Imap.class.php → old/src/Mail/Imap.class.php b/src/Mail/Imap.class.php → old/src/Mail/Imap.class.php
diff --git a/src/Mail/Imap/Account.class.php → old/src/Mail/Imap/Account.class.php b/src/Mail/Imap/Account.class.php → old/src/Mail/Imap/Account.class.php
diff --git a/src/Mail/Imap/Box.class.php → old/src/Mail/Imap/Box.class.php b/src/Mail/Imap/Box.class.php → old/src/Mail/Imap/Box.class.php
diff --git a/src/Mail/Imap/Quota.class.php → old/src/Mail/Imap/Quota.class.php b/src/Mail/Imap/Quota.class.php → old/src/Mail/Imap/Quota.class.php
diff --git a/src/Mail/Search/Condition.class.php → old/src/Mail/Search/Condition.class.php b/src/Mail/Search/Condition.class.php → old/src/Mail/Search/Condition.class.php
diff --git a/src/Process/Progress.class.php → old/src/Process/Progress.class.php b/src/Process/Progress.class.php → old/src/Process/Progress.class.php
diff --git a/tests/Integration/Aws/CloudWatchLogsTest.php → ...ts/Integration/Aws/CloudWatchLogsTest.php b/tests/Integration/Aws/CloudWatchLogsTest.php → ...ts/Integration/Aws/CloudWatchLogsTest.php
diff --git a/tests/Integration/DmmTest.php → old/tests/Integration/DmmTest.php b/tests/Integration/DmmTest.php → old/tests/Integration/DmmTest.php
diff --git a/tests/Integration/SlackTest.php → old/tests/Integration/SlackTest.php b/tests/Integration/SlackTest.php → old/tests/Integration/SlackTest.php
diff --git a/tests/MessageTest.php → old/tests/MessageTest.php b/tests/MessageTest.php → old/tests/MessageTest.php
diff --git a/tests/Router/DeviceTest.php → old/tests/Router/DeviceTest.php b/tests/Router/DeviceTest.php → old/tests/Router/DeviceTest.php
@@ -11,7 +11,7 @@
 namespace Test\Database;
 
 use Citrus\Configure\ConfigureException;
-use Citrus\Router\Device;
+use Citrus\Router\Protocol;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -29,8 +29,8 @@ public function 設定を読み込んで適用できる()
         $configures = require(dirname(__DIR__) . '/citrus-configure.php');
 
         // 生成
-        /** @var Device $device */
-        $device = Device::sharedInstance()->loadConfigures($configures);
+        /** @var Protocol $device */
+        $device = Protocol::sharedInstance()->loadConfigures($configures);
 
         // 検証
         $device_list = [
@@ -45,7 +45,7 @@ public function 設定を読み込んで適用できる()
         ];
         foreach ($device_list as $one)
         {
-            $this->assertSame($configures['default']['device'][$one], $device->device_routes[$one]);
+            $this->assertSame($configures['default']['device'][$one], $device->protocol_routes[$one]);
         }
     }
 }
diff --git a/tests/Router/ItemTest.php → old/tests/Router/ItemTest.php b/tests/Router/ItemTest.php → old/tests/Router/ItemTest.php
@@ -11,7 +11,7 @@
 namespace Test\Router;
 
 use Citrus\Configure\ConfigureException;
-use Citrus\Router\Device;
+use Citrus\Router\Protocol;
 use Citrus\Router\Item;
 use PHPUnit\Framework\TestCase;
 
@@ -30,8 +30,8 @@ public function パスを読み込んでパースできる()
         $configures = require(dirname(__DIR__) . '/citrus-configure.php');
 
         // 生成
-        /** @var Device $router_device */
-        $router_device = Device::sharedInstance()->loadConfigures($configures);
+        /** @var Protocol $router_device */
+        $router_device = Protocol::sharedInstance()->loadConfigures($configures);
 
         // URLパス設計
         $device = 'pc';

diff --git a/tests/Router/RuleTest.php → old/tests/Router/RuleTest.php b/tests/Router/RuleTest.php → old/tests/Router/RuleTest.php
diff --git a/phpinsights.php b/phpinsights.php
@@ -52,9 +52,9 @@
         ],
         PhpCsFixer\Fixer\Basic\BracesFixer::class => [
             'allow_single_line_closure' => false,
-            'position_after_anonymous_constructs' => 'next',
-            'position_after_control_structures' => 'next',
-            'position_after_functions_and_oop_constructs' => 'next',
+            'position_after_anonymous_constructs' => 'same', // possible values ['same', 'next']
+            'position_after_control_structures' => 'next', // possible values ['same', 'next']
+            'position_after_functions_and_oop_constructs' => 'next', // possible values ['same', 'next']
         ],
         SlevomatCodingStandard\Sniffs\Commenting\DocCommentSpacingSniff::class => [
             'linesCountBeforeFirstContent' => 0,

diff --git a/src/Accessor.class.php b/src/Accessor.class.php