ryo-endo · okazy · Sep 13, 2018 · Sep 13, 2018 · Sep 13, 2018 · Sep 13, 2018
diff --git a/.gitignore b/.gitignore
@@ -12,6 +12,8 @@ composer.phar
 /app/Plugin/*
 !/app/Plugin/.gitkeep
 !/app/Plugin/ExamplePlugin
+/app/PluginData/*
+!/app/PluginData/.gitkeep
 /app/template/*
 !/app/template/admin
 !/app/template/default

diff --git a/.htaccess b/.htaccess
@@ -10,12 +10,14 @@ DirectoryIndex index.php index.html .ht
     allow from all
 </Files>
 
-# クリックジャッキング対策
-Header always set X-Frame-Options SAMEORIGIN
+<IfModule mod_headers.c>
+    # クリックジャッキング対策
+    Header always set X-Frame-Options SAMEORIGIN
 
-# XSS対策
-Header set X-XSS-Protection "1; mode=block"
-Header set X-Content-Type-Options nosniff
+    # XSS対策
+    Header set X-XSS-Protection "1; mode=block"
+    Header set X-Content-Type-Options nosniff
+</IfModule>
 
 <IfModule mod_rewrite.c>
     #403 Forbidden対応方法
@@ -24,7 +26,7 @@ Header set X-Content-Type-Options nosniff
     #Options +FollowSymLinks +SymLinksIfOwnerMatch
 
     RewriteEngine On
-    
+
     # Authorization ヘッダが取得できない環境への対応
     RewriteCond %{HTTP:Authorization} ^(.*)
     RewriteRule ^(.*) - [E=HTTP_AUTHORIZATION:%1]
@@ -47,3 +49,17 @@ Header set X-Content-Type-Options nosniff
     RewriteCond %{REQUEST_FILENAME} !^(.*)\.(gif|png|jpe?g|css|ico|js|svg|map)$ [NC]
     RewriteRule ^(.*)$ index.php [QSA,L]
 </IfModule>
+
+# 管理画面へのBasic認証サンプル
+# 
+#     AuthType Basic
+#     AuthName "Please enter username and password"
+#     AuthUserFile /path/to/.htpasswd
+#     AuthGroupFile /dev/null
+#     require valid-user
+#
+#     SetEnvIf Request_URI "^/admin" admin_path  # ^/adminは, 管理画面URLに応じて変更してください
+# <RequireAll>
+#     Require all granted
+#     Require not env admin_path
+# </RequireAll>#
diff --git a/.travis.yml b/.travis.yml
diff --git a/README.md b/README.md
@@ -1,11 +1,11 @@
-# EC-CUBE 4.0-beta
+# EC-CUBE 4.0
 
 [![Build Status](https://travis-ci.com/EC-CUBE/ec-cube.svg?branch=4.0)](https://travis-ci.com/EC-CUBE/ec-cube)
 [![Build status](https://ci.appveyor.com/api/projects/status/lg3uh1539cwln2g6/branch/4.0?svg=true)](https://ci.appveyor.com/project/ECCUBE/ec-cube/branch/4.0)
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/EC-CUBE/ec-cube/badges/quality-score.png?b=4.0)](https://scrutinizer-ci.com/g/EC-CUBE/ec-cube/?branch=4.0)
 [![Coverage Status](https://coveralls.io/repos/github/EC-CUBE/ec-cube/badge.svg?branch=4.0)](https://coveralls.io/github/EC-CUBE/ec-cube?branch=4.0)
 
-[![Slack](http://img.shields.io/badge/slack-join%5fchat-brightgreen.svg?style=flat)](https://ec-cube.slack.com/messages)
+[![Slack](http://img.shields.io/badge/slack-join%5fchat-brightgreen.svg?style=flat)](https://www.ec-cube.net/rd.php?aid=join-slack)
 
 [![Deploy](https://www.herokucdn.com/deploy/button.png)](https://heroku.com/deploy)
 
@@ -62,7 +62,7 @@ EC-CUBE 4.0の不具合の修正、機能のブラッシュアップを目的と
 Pull Requestの送信前に、Issueにて提議いただく事も可能です。  
 Issuesの利用方法については、[こちら](https://github.com/EC-CUBE/ec-cube/wiki/Issues%E3%81%AE%E5%88%A9%E7%94%A8%E6%96%B9%E6%B3%95)をご確認ください。  
 
-[Slack](https://ec-cube.slack.com/messages)でも本体の開発に関する意見交換などを行っております。
+[Slack](https://www.ec-cube.net/rd.php?aid=join-slack)でも本体の開発に関する意見交換などを行っております。
 
 
 

diff --git a/app/DoctrineMigrations/Version20181017090225.php b/app/DoctrineMigrations/Version20181017090225.php
@@ -0,0 +1,23 @@
+<?php declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20181017090225 extends AbstractMigration
+{
+    public function up(Schema $schema) : void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+
+    }
+
+    public function down(Schema $schema) : void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+    }
+}
diff --git a/app/DoctrineMigrations/Version20181109101907.php b/app/DoctrineMigrations/Version20181109101907.php
@@ -0,0 +1,22 @@
+<?php declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20181109101907 extends AbstractMigration
+{
+    public function up(Schema $schema) : void
+    {
+        $this->addSql("UPDATE dtb_page SET page_name = '商品購入/遷移', url = 'shopping_redirect_to' WHERE id = 42");
+    }
+
+    public function down(Schema $schema) : void
+    {
+        $this->addSql("UPDATE dtb_page SET page_name = '商品購入/お届け先変更', url = 'shopping_shipping_edit_change' WHERE id = 42");
+    }
+}
diff --git a/app/Plugin/MigrationSample/DoctrineMigrations/Version20181101012712.php b/app/Plugin/MigrationSample/DoctrineMigrations/Version20181101012712.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Plugin\MigrationSample\DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20181101012712 extends AbstractMigration
+{
+    public function up(Schema $schema) : void
+    {
+        $Table = $schema->getTable('dtb_base_info');
+        if ($Table->hasColumn('migration_sample')) {
+            $this->addSql('UPDATE dtb_base_info SET migration_sample = ? WHERE id = 1', ['up']);
+            dump('up');
+        }
+    }
+
+    public function down(Schema $schema) : void
+    {
+        $Table = $schema->getTable('dtb_base_info');
+        if ($Table->hasColumn('migration_sample')) {
+            $this->addSql('UPDATE dtb_base_info SET migration_sample = ? WHERE id = 1', ['down']);
+            dump('down');
+        }
+    }
+}
diff --git a/app/Plugin/MigrationSample/Entity/BaseInfo3Trait.php b/app/Plugin/MigrationSample/Entity/BaseInfo3Trait.php
@@ -0,0 +1,30 @@
+<?php
+
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Plugin\MigrationSample\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+use Eccube\Annotation\EntityExtension;
+
+/**
+ * @EntityExtension("Eccube\Entity\BaseInfo")
+ */
+trait BaseInfo3Trait
+{
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="migration_sample", type="string", length=255, nullable=true)
+     */
+    private $migration_sample;
+}
diff --git a/app/Plugin/MigrationSample/PluginManager.php b/app/Plugin/MigrationSample/PluginManager.php
@@ -0,0 +1,83 @@
+<?php
+
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Plugin\MigrationSample;
+
+use Eccube\Plugin\AbstractPluginManager;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Class PluginManager.
+ */
+class PluginManager extends AbstractPluginManager
+{
+    const VERSION = '1.0.0';
+    /**
+     * Install the plugin.
+     *
+     * @param array $meta
+     * @param ContainerInterface $container
+     */
+    public function install(array $meta, ContainerInterface $container)
+    {
+        dump('install '.self::VERSION);
+    }
+
+    /**
+     * Update the plugin.
+     *
+     * @param array $meta
+     * @param ContainerInterface $container
+     */
+    public function update(array $meta, ContainerInterface $container)
+    {
+        $entityManager = $container->get('doctrine')->getManager();
+        dump('update '.self::VERSION);
+        $this->migration($entityManager->getConnection(), $meta['code']);
+    }
+
+    /**
+     * Enable the plugin.
+     *
+     * @param array $meta
+     * @param ContainerInterface $container
+     */
+    public function enable(array $meta, ContainerInterface $container)
+    {
+        dump('enable '.self::VERSION);
+    }
+
+    /**
+     * Disable the plugin.
+     *
+     * @param array $meta
+     * @param ContainerInterface $container
+     */
+    public function disable(array $meta, ContainerInterface $container)
+    {
+        $entityManager = $container->get('doctrine')->getManager();
+        dump('disable '.self::VERSION);
+        $this->migration($entityManager->getConnection(), $meta['code'], '0');
+    }
+
+    /**
+     * Uninstall the plugin.
+     *
+     * @param array $meta
+     * @param ContainerInterface $container
+     */
+    public function uninstall(array $meta, ContainerInterface $container)
+    {
+        dump('uninstall '.self::VERSION);
+    }
+}
diff --git a/app/Plugin/MigrationSample/composer.json b/app/Plugin/MigrationSample/composer.json
@@ -0,0 +1,12 @@
+{
+  "name": "ec-cube/MigrationSample",
+  "version": "1.0.0",
+  "description": "マイグレーションのサンプルプラグイン",
+  "type": "eccube-plugin",
+  "require": {
+    "ec-cube/plugin-installer": "~0.0.6"
+  },
+  "extra": {
+    "code": "MigrationSample"
+  }
+}
diff --git a/app/PluginData/.gitkeep b/app/PluginData/.gitkeep
diff --git a/app/config/eccube/bundles.php b/app/config/eccube/bundles.php
@@ -16,6 +16,7 @@
     Symfony\Bundle\SecurityBundle\SecurityBundle::class => ['all' => true],
     Doctrine\Bundle\DoctrineCacheBundle\DoctrineCacheBundle::class => ['all' => true],
     Doctrine\Bundle\DoctrineBundle\DoctrineBundle::class => ['all' => true],
+    Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle::class => ['all' => true],
     Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle::class => ['all' => true],
     Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle::class => ['all' => true],
     Symfony\Bundle\MonologBundle\MonologBundle::class => ['all' => true],

diff --git a/app/config/eccube/packages/doctrine_migrations.yaml b/app/config/eccube/packages/doctrine_migrations.yaml
@@ -0,0 +1,4 @@
+doctrine_migrations:
+    dir_name: "%kernel.project_dir%/app/DoctrineMigrations"
+    namespace: DoctrineMigrations
+    organize_migrations: false
diff --git a/app/config/eccube/packages/eccube.yaml b/app/config/eccube/packages/eccube.yaml
@@ -10,7 +10,7 @@ parameters:
     env(ECCUBE_COOKIE_PATH): '/'
     env(ECCUBE_COOKIE_LIFETIME): 0
     env(ECCUBE_GC_MAXLIFETIME): 1440
-    env(ECCUBE_PACKAGE_API_URL): 'https://beta-package-api.ec-cube.net'
+    env(ECCUBE_PACKAGE_API_URL): 'https://package-api.ec-cube.net'
     env(ECCUBE_OWNERS_STORE_URL): 'https://www.ec-cube.net'
 
     # EC-CUBE parameter
@@ -56,6 +56,7 @@ parameters:
     plugin_html_realdir: '%eccube_html_dir%/plugin/'
     plugin_html_urlpath: /plugin/ # asset 使う
     plugin_realdir: '%kernel.project_dir%/app/Plugin'
+    plugin_data_realdir: '%kernel.project_dir%/app/PluginData'
     plugin_temp_realdir: /PATH/TO/WEB_ROOT/src/Eccube/Repository/Master/upload/temp_plugin/ # upload_tmp_dir に任せればよい？
     eccube_price_len: 8                                                    # 最大値で制御したい
     eccube_search_pmax: 10
@@ -119,3 +120,5 @@ parameters:
     eccube_order_no_format: ''
     eccube_order_pdf_message_len: 30
     eccube_news_start_year: 2000
+    eccube_result_cache_lifetime: 3600 # doctrineのresult cacheのlifetime.
+    eccube_result_cache_lifetime_short: 10  # doctrineのresult cacheのlifetime. 商品一覧画面など長期間キャッシュできない箇所で使用する.
diff --git a/app/config/eccube/packages/framework.yaml b/app/config/eccube/packages/framework.yaml
@@ -31,7 +31,7 @@ framework:
         save_image:
           base_path: '/html/upload/save_image'
         plugin:
-          base_path: '/html/template/plugin'
+          base_path: '/html/plugin'
         install:
           base_path: '/html/template/install'
         temp_image:

diff --git a/app/config/eccube/packages/mobile_detect.yaml b/app/config/eccube/packages/mobile_detect.yaml
diff --git a/app/config/eccube/packages/purchaseflow.yaml b/app/config/eccube/packages/purchaseflow.yaml
@@ -101,6 +101,7 @@ services:
         class: Doctrine\Common\Collections\ArrayCollection
         arguments:
             - #
+                - '@Eccube\Service\PurchaseFlow\Processor\PreOrderIdValidator'
                 - '@Eccube\Service\PurchaseFlow\Processor\PointProcessor'
                 - '@Eccube\Service\PurchaseFlow\Processor\StockReduceProcessor'
                 - '@Eccube\Service\PurchaseFlow\Processor\CustomerPurchaseInfoProcessor'
@@ -147,6 +148,8 @@ services:
             - #
                 - '@Eccube\Service\PurchaseFlow\Processor\AddPointProcessor'  # 加算ポイントの計算
                 - '@Eccube\Service\PurchaseFlow\Processor\PaymentTotalLimitValidator'
+                - '@Eccube\Service\PurchaseFlow\Processor\PaymentTotalNegativeValidator'  # 支払金額のマイナスチェック
+
 
     eccube.purchase.flow.order.purchase:
         class: Doctrine\Common\Collections\ArrayCollection

diff --git a/app/config/eccube/packages/security.yaml b/app/config/eccube/packages/security.yaml
@@ -32,6 +32,8 @@ security:
                 username_parameter: 'login_id'
                 password_parameter: 'password'
                 use_forward: true
+                success_handler: eccube.security.success_handler
+                failure_handler: eccube.security.failure_handler
             logout:
                 path: admin_logout
                 target: admin_login
@@ -52,20 +54,12 @@ security:
                 username_parameter: 'login_email'
                 password_parameter: 'login_pass'
                 use_forward: true
+                success_handler: eccube.security.success_handler
+                failure_handler: eccube.security.failure_handler
             logout:
                 path: logout
                 target: homepage
 
-    access_control:
-        # this is a catch-all for the admin area
-        # additional security lives in the controllers
-        - { path: '^/%eccube_admin_route%/login', roles: IS_AUTHENTICATED_ANONYMOUSLY, requires_channel: "@=container.getParameter('eccube_force_ssl') ? 'https' : 'http'" }
-        - { path: '^/%eccube_admin_route%/', roles: ROLE_ADMIN, requires_channel: "@=container.getParameter('eccube_force_ssl') ? 'https' : 'http'"  }
-        - { path: ^/mypage/login, roles: IS_AUTHENTICATED_ANONYMOUSLY, requires_channel: "@=container.getParameter('eccube_force_ssl') ? 'https' : 'http'" }
-        - { path: ^/mypage/withdraw_complete, roles: IS_AUTHENTICATED_ANONYMOUSLY, requires_channel: "@=container.getParameter('eccube_force_ssl') ? 'https' : 'http'" }
-        - { path: ^/mypage/change, roles: IS_AUTHENTICATED_FULLY, requires_channel: "@=container.getParameter('eccube_force_ssl') ? 'https' : 'http'" }
-        - { path: ^/mypage/, roles: ROLE_USER, requires_channel: "@=container.getParameter('eccube_force_ssl') ? 'https' : 'http'" }
-
     access_decision_manager:
         strategy: unanimous
         allow_if_all_abstain: false