v1.0

.gitattributes

@@ -0,0 +1 @@
+* text=auto eol=lf

.github/workflows/code_quality.yaml

@@ -0,0 +1,92 @@
+name: "Code Quality"
+
+on:
+  pull_request:
+    paths:
+      - src
+      - composer.json
+      - phpcs.xml.dist
+      - phpstan.neon.dist
+      - phpunit.xml.dist
+  push:
+    branches:
+      - master
+
+jobs:
+  test:
+    name: "Test"
+    runs-on: ${{ matrix.operating-system }}
+    timeout-minutes: 60
+
+    strategy:
+      fail-fast: false
+      matrix:
+        php-version: [ "8.0", "8.1" ]
+        operating-system: [ ubuntu-latest, windows-latest ]
+
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v2"
+
+      - name: "Install PHP"
+        uses: "shivammathur/setup-php@v2"
+        with:
+          php-version: "${{ matrix.php-version }}"
+
+      - name: "Install"
+        run: "composer install --no-interaction --no-progress"
+
+      - name: "Test"
+        run: "composer test"
+
+  format:
+    name: "Format"
+    runs-on: ${{ matrix.operating-system }}
+    timeout-minutes: 60
+
+    strategy:
+      fail-fast: false
+      matrix:
+        php-version: [ "8.0", "8.1" ]
+        operating-system: [ ubuntu-latest, windows-latest ]
+
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v2"
+
+      - name: "Install PHP"
+        uses: "shivammathur/setup-php@v2"
+        with:
+          php-version: "${{ matrix.php-version }}"
+
+      - name: "Install"
+        run: "composer install --no-interaction --no-progress"
+
+      - name: "Format"
+        run: "composer format"
+
+  lint:
+    name: "Lint"
+    runs-on: ${{ matrix.operating-system }}
+    timeout-minutes: 60
+
+    strategy:
+      fail-fast: false
+      matrix:
+        php-version: [ "8.0", "8.1" ]
+        operating-system: [ ubuntu-latest, windows-latest ]
+
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v2"
+
+      - name: "Install PHP"
+        uses: "shivammathur/setup-php@v2"
+        with:
+          php-version: "${{ matrix.php-version }}"
+
+      - name: "Install"
+        run: "composer install --no-interaction --no-progress"
+
+      - name: "Lint"
+        run: "composer lint"

.gitignore

@@ -1,2 +1,3 @@
 /vendor/
-/composer.lock
+/composer.lock
+/.phpunit.result.cache

LICENSE

@@ -1,21 +1,9 @@
 MIT License
 
-Copyright (c) 2017 FratilyPHP
+Copyright FratilyPHP
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.md

@@ -1,93 +1 @@
 # FratilyPHP
-
-Fratily is a web application framework being developed with PHP, for studying.
-
-# 現状での使い方
-
-```php
-
-/**
- * Aura DI コンテナ
- */
-class DefaultConfig extends Aura\Di\ContainerConfig{
-
-    public function define(Aura\Di\Container $di){
-        $di->set(Interop\Http\Factory\ResponseFactoryInterface::class, $di->lazyNew(Fratily\Http\Factory\ResponseFactory::class));
-    }
-}
-
-/**
- * コントローラークラス
- */
-class IndexController extends Fratily\Framework\Controller\Controller{
-
-    public function index(){
-        return "This is index page";
-    }
-
-    public function page($page){
-        return "This is page$page page";
-    }
-}
-
-/*
- * アクセスログのようなものを出力するミドルウェア
- */
-class AccessMiddleware implements Psr\Http\Server\MiddlewareInterface{
-
-    private $dir;
-
-    public function __construct(string $dir){
-        if(!is_dir($dir)){
-            throw new InvalidArgumentException();
-        }
-
-        $this->dir  = realpath($dir);
-    }
-
-    public function process(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Server\RequestHandlerInterface $handler): \Psr\Http\Message\ResponseInterface{
-        $fp = fopen($this->dir . DIRECTORY_SEPARATOR . "log", "a+");
-
-        fwrite($fp, date("Y-m-d H:i:s") . " " . $_SERVER["REQUEST_METHOD"] . "\t" . $_SERVER["REQUEST_URI"] . PHP_EOL);
-
-        return $handler->handle($request);
-    }
-}
-
-// DIコンテナを生成
-$c  = (new Aura\Di\ContainerBuilder)->newConfiguredInstance([
-    DefaultConfig::class
-]);
-
-// ルート定義
-$routes = new Fratily\Router\RouteCollector();
-
-$routes->get("index", "/", [
-    "action"    => [IndexController::class, "index"]
-]);
-
-$routes->get("page", "/page/{page:[1-9][0-9]*}", [
-    "action"    => [IndexController::class, "page"]
-]);
-
-$routes->get("func", "/func", [
-    "action"    => function(){
-        return "This is function page.";
-    }
-]);
-
-// アプリケーションインスタンスを生成
-$app    = new Fratily\Framework\Application($c, $routes, true);
-// ミドルウェアを追加
-$app->append(new AccessMiddleware(__DIR__));
-
-// リクエストインスタンスを生成
-$request    = (new Fratily\Http\Factory\ServerRequestFactory())->createServerRequestFromArray($_SERVER);
-
-// ミドルウェアハンドラを実行
-$handler    = $app->generateHandler($request);
-
-// レスポンスを送信
-$emitter    = new Fratily\Http\Message\Response\Emitter();
-$emitter->emit($handler->handle($request));
-```

composer.json

@@ -8,39 +8,41 @@
         }
     ],
     "license": "MIT",
+    "scripts": {
+        "test": [ "@phpunit:unit" ],
+        "format": [ "@phpcs" ],
+        "lint": [ "@phpstan" ],
+
+        "phpunit:unit": "phpunit --testsuite unit",
+        "phpcs": "phpcs",
+        "phpcbf": "phpcbf",
+        "phpstan": "phpstan analyze"
+    },
     "require": {
-        "php": "^7.1",
-        "psr/container": "^1.0",
-        "psr/log": "^1.0",
-        "fratily/cache": "^0.0.1",
-        "fratily/router": "^0.4.0",
-        "fratily/http-message": "^0.1.0",
-        "fratily/http-message-factory": "^0.2.0",
-        "fratily/http-server-middleware": "^0.2.0",
-        "fratily/reflection": "^0.4.0",
-        "fratily/utility": "^0.1.0",
-        "fratily/container": "^0.3.0",
-        "fratily/event-manager": "^0.1.0",
-        "twig/twig": "^2.0",
-        "fratily/debugbar": "^0.2.0"
+        "php": "^8.0",
+        "psr/event-dispatcher": "^1.0",
+        "psr/http-message": "^1.0",
+        "psr/http-server-handler": "^1.0",
+        "psr/http-server-middleware": "^1.0"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^9.5",
+        "squizlabs/php_codesniffer": "^3.6",
+        "phpstan/phpstan": "^1.4",
+        "phpstan/phpstan-phpunit": "^1.0",
+        "phpstan/phpstan-strict-rules": "^1.1"
     },
     "autoload": {
         "psr-4": {
             "Fratily\\Framework\\": "src/"
-        },
-        "files": [
-            "src/bootstrap.php"
-        ]
-    },
-    "require-dev": {
-        "phpunit/phpunit": "^7.0"
+        }
     },
     "autoload-dev": {
         "psr-4": {
             "Fratily\\Tests\\Framework\\": "tests/"
         }
     },
-    "scripts": {
-        "test": "phpunit"
+    "config": {
+        "sort-packages": true
     }
 }

phpcs.xml.dist

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ruleset
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="./vendor/squizlabs/php_codesniffer/phpcs.xsd"
+>
+    <arg name="extensions" value="php" />
+    <arg name="report" value="code"/>
+    <arg name="colors"/>
+    <arg value="ps"/>
+
+    <file>./src</file>
+    <file>./tests</file>
+
+    <rule ref="PSR12"></rule>
+
+    <rule ref="Generic.Files.LineLength">
+        <properties>
+            <property name="lineLimit" value="120"/>
+            <property name="absoluteLineLimit" value="0"/>
+        </properties>
+    </rule>
+</ruleset>

phpstan.neon.dist

@@ -0,0 +1,10 @@
+includes:
+    - vendor/phpstan/phpstan-phpunit/extension.neon
+    - vendor/phpstan/phpstan-phpunit/rules.neon
+    - vendor/phpstan/phpstan-strict-rules/rules.neon
+parameters:
+    paths:
+        - src
+        - tests
+    level: max
+    ignoreErrors:

phpunit.xml.dist

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
+    bootstrap="vendor/autoload.php"
+    colors="true"
+>
+    <testsuites>
+        <testsuite name="unit">
+            <directory>./tests/Unit</directory>
+        </testsuite>
+    </testsuites>
+</phpunit>