Merge 1a9df62 into 195c5b6

.gitignore

@@ -1,8 +1,18 @@
-data/Smarty/templates_c/**/*.tpl.php
-data/cache/*.php
-data/cache/*.serial
-html/install/temp/*.tpl.php
-data/config/config.php
-data/logs/*.log*
-html/upload/mobile_image/*
-data/upload/csv/*
+composer.phar
+!dummy
+/vendor/
+/data/Smarty/templates_c/*
+/data/cache/*
+/data/config/config.php
+/data/logs/*
+/data/upload/csv/*
+/html/install/temp/*
+/html/upload/graph_image/*
+/html/upload/mobile_image/*
+/html/upload/save_image/*
+/html/upload/temp_image/*
+/html/upload/temp_plugin/*
+/html/upload/temp_template/*
+/phpunit.xml
+/tests/tmp/*
+/reports/*

.travis.yml

@@ -17,14 +17,13 @@ before_script:
   - php composer.phar install --dev --no-interaction
   - sh -c "if [ '$DB' = 'mysql' ]; then sh ./eccube_install.sh mysql; fi"
   - sh -c "if [ '$DB' = 'pgsql' ]; then sh ./eccube_install.sh pgsql; fi"
-  - cp tests/require.php.jenkins tests/require.php
   - cat ./data/config/config.php
   - npm install -g grunt-cli 
   - npm install 
 
 script:
   - mkdir -p reports/coverage
-  - phpunit -c phpunit.xml.dist
+  - vendor/bin/phpunit -c phpunit.xml.dist
   - grunt
 
 after_script:

appveyor.yml

@@ -59,8 +59,7 @@ build: off
 
 before_test:
   - bash eccube_install.sh mysql
-  - cp tests/require.php.jenkins tests/require.php
-
+
 test_script:
   - php -i
   - vendor\bin\phpunit.bat --bootstrap data\config\config.php tests

composer.json

@@ -1,6 +1,49 @@
 {
+    "name": "EC-CUBE/ec-cube",
+    "description": "EC-CUBE EC open platform.",
+    "type": "project",
+    "homepage": "http://www.ec-cube.net/",
+    "license": [
+       "GPL-2.0",
+       "Commercial"
+    ],
+    "support": {
+        "issues": "https://github.com/EC-CUBE/ec-cube/issues"
+    },
+    "repositories": [
+            {
+                    "type": "pear",
+                    "url": "http://pear.php.net/"
+            }
+    ],
+    "require": {
+        "php": ">=5.3.3",
+        "smarty/smarty": "~2.6",
+        "mobiledetect/mobiledetectlib": "~2.8",
+        "pear-pear.php.net/PEAR" : "*",
+        "pear-pear.php.net/Archive_Tar" : "*",
+        "pear-pear.php.net/Mail" : "*",
+        "pear-pear.php.net/Calendar" : "*",
+        "pear-pear.php.net/Cache_Lite" : "*",
+        "pear-pear.php.net/File_SearchReplace" : "*",
+        "pear-pear.php.net/HTTP_Request" : "*",
+        "pear-pear.php.net/MDB2_Driver_mysql" : "1.5.0b4",
+        "pear-pear.php.net/MDB2_Driver_pgsql" : "1.5.0b4",
+        "pear-pear.php.net/MDB2" : "2.5.0-beta5 as 2.5.0",
+        "pear-pear.php.net/Net_SMTP" : "*",
+        "pear-pear.php.net/Net_Socket" : "*",
+        "pear-pear.php.net/Net_URL" : "*",
+        "pear-pear.php.net/Net_UserAgent_Mobile" : "*",
+        "pear-pear.php.net/SOAP" : "*",
+        "pear-pear.php.net/Services_JSON" : "*",
+        "pear-pear.php.net/Text_Password" : "*",
+        "pear-pear.php.net/XML_Parser" : "*",
+        "pear-pear.php.net/XML_Serializer" : "*",
+        "pear-pear.php.net/XML_Util" : "*"
+    },
     "require-dev": {
         "satooshi/php-coveralls": "dev-master",
-        "phpunit/phpunit": "3.7.*"
+        "phpunit/phpunit": "3.7.*",
+        "phing/phing": "2.*"
     }
 }