Merge pull request #52 from eccubevn/change_session

Change session rule
EC-CUBE · Jul 18, 2017 · 45a2b14 · 45a2b14
2 parents e602190 + e508a88
commit 45a2b14
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 15 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -25,12 +25,9 @@ env:
     # ec-cube 3.0.9
     - ECCUBE_VERSION=3.0.9 DB=mysql USER=root DBNAME=myapp_test DBPASS=' ' DBUSER=root
     - ECCUBE_VERSION=3.0.9 DB=pgsql USER=postgres DBNAME=myapp_test DBPASS=password DBUSER=postgres
-    # ec-cube 3.0.10
-    - ECCUBE_VERSION=3.0.10 DB=mysql USER=root DBNAME=myapp_test DBPASS=' ' DBUSER=root
-    - ECCUBE_VERSION=3.0.10 DB=pgsql USER=postgres DBNAME=myapp_test DBPASS=password DBUSER=postgres
     # ec-cube 3.0.11
-    - ECCUBE_VERSION=3.0.11 DB=mysql USER=root DBNAME=myapp_test DBPASS=' ' DBUSER=root
-    - ECCUBE_VERSION=3.0.11 DB=pgsql USER=postgres DBNAME=myapp_test DBPASS=password DBUSER=postgres
+    - ECCUBE_VERSION=3.0.13 DB=mysql USER=root DBNAME=myapp_test DBPASS=' ' DBUSER=root
+    - ECCUBE_VERSION=3.0.13 DB=pgsql USER=postgres DBNAME=myapp_test DBPASS=password DBUSER=postgres
 matrix:
   fast_finish: true
   include:
@@ -50,10 +47,6 @@ matrix:
       env: ECCUBE_VERSION=3.0.9 DB=mysql USER=root DBNAME=myapp_test DBPASS=' ' DBUSER=root
     - php: 7.0
       env: ECCUBE_VERSION=3.0.9 DB=pgsql USER=postgres DBNAME=myapp_test DBPASS=password DBUSER=postgres
-    - php: 7.0
-      env: ECCUBE_VERSION=3.0.10 DB=mysql USER=root DBNAME=myapp_test DBPASS=' ' DBUSER=root
-    - php: 7.0
-      env: ECCUBE_VERSION=3.0.10 DB=pgsql USER=postgres DBNAME=myapp_test DBPASS=password DBUSER=postgres
 
 install:
   - gem install mime-types -v 2.99.1

diff --git a/Controller/Admin/RelatedProductController.php b/Controller/Admin/RelatedProductController.php
@@ -42,8 +42,7 @@ public function searchProduct(Application $app, Request $request, $page_no = nul
                 'id' => $request->get('id'),
             );
             if ($categoryId = $request->get('category_id')) {
-                $Category = $app['eccube.repository.category']->find($categoryId);
-                $searchData['category_id'] = $Category;
+                $searchData['category_id'] = $categoryId;
             }
             $session->set('eccube.plugin.related_product.product.search', $searchData);
             $session->set('eccube.plugin.related_product.product.search.page_no', $page_no);
@@ -56,6 +55,10 @@ public function searchProduct(Application $app, Request $request, $page_no = nul
             }
         }
 
+        if (!empty($searchData['category_id'])) {
+            $searchData['category_id'] = $app['eccube.repository.category']->find($searchData['category_id']);
+        }
+
         $qb = $app['eccube.repository.product']->getQueryBuilderBySearchDataForAdmin($searchData);
 
         /** @var \Knp\Component\Pager\Pagination\SlidingPagination $pagination */

diff --git a/Utils/Version.php b/Utils/Version.php
@@ -20,7 +20,7 @@ class Version
     /**
      * Check version to support get instance function. (monolog, new style, ...)
      *
-     * @return bool|int|mixed|void
+     * @return bool
      */
     public static function isSupportGetInstanceFunction()
     {
@@ -29,7 +29,7 @@ public static function isSupportGetInstanceFunction()
     /**
      * Check version to support get new hookpoint function. (monolog, new style, ...)
      *
-     * @return bool|int|mixed|void
+     * @return bool
      */
     public static function isSupportNewHookpoint()
     {
@@ -38,7 +38,7 @@ public static function isSupportNewHookpoint()
     /**
      * Check version to support new log function.
      *
-     * @return bool|int|mixed|void
+     * @return bool
      */
     public static function isSupportLogFunction()
     {

diff --git a/config.yml b/config.yml
@@ -1,6 +1,6 @@
 name: 関連商品プラグイン
 code: RelatedProduct
-version: 1.0.0
+version: 1.0.1
 service:
     - RelatedProductServiceProvider
 orm.path: