Changeset 23588

Timestamp:

2014/08/13 22:29:06 (10 years ago)

Author:

kimoto

Message:

#2386 PHP 警告撲滅 for 2.13.3

PHP Notice: ob_end_clean(): failed to delete buffer. No buffer to delete が出ているので修正
合わせて同じ処理が3ファイルに書かれていたので集約
travis.ymlの不要な行を削除
indentの修正

Location:

branches/version-2_13-dev

Files:

• .travis.yml (modified) (1 diff)
• html/admin/require.php (modified) (1 diff)
• html/define.php (modified) (1 diff)
• html/install/index.php (modified) (1 diff)
• html/require.php (modified) (1 diff)
• tests/class/Common_TestCase.php (modified) (4 diffs)

branches/version-2_13-dev/.travis.yml

@@ -15 +15 @@
   - curl -s http://getcomposer.org/installer | php
   - php composer.phar install --dev --no-interaction
-  - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'CREATE DATABASE myapp_test;'; fi"
   - sh -c "if [ '$DB' = 'mysql' ]; then sh ./eccube_install.sh mysql; fi"
-  - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'create database myapp_test;' -U postgres; fi"
   - sh -c "if [ '$DB' = 'pgsql' ]; then sh ./eccube_install.sh pgsql; fi"
   - cp tests/require.php.jenkins tests/require.php

branches/version-2_13-dev/html/admin/require.php

@@ -30 +30 @@
 
 require_once HTML_REALDIR . 'define.php';
-if (ob_get_level() > 0 && ob_get_length() > 0) {
-    while (ob_end_clean());
-}
 require_once HTML_REALDIR . HTML2DATA_DIR . 'require_base.php';
 ob_start();

branches/version-2_13-dev/html/define.php

@@ -14 +14 @@
 define('USE_FILENAME_DIR_INDEX', null);
 
+// bufferを初期化する
+while (ob_get_level() > 0 && ob_get_level() > 0) {
+    ob_end_clean();
+}
+
 /*
  * Local variables:

branches/version-2_13-dev/html/install/index.php

@@ -31 +31 @@
 define('INSTALL_FUNCTION', true);
 define('INSTALL_INFO_URL', 'http://www.ec-cube.net/install_info/index.php');
-if (ob_get_level() > 0 && ob_get_length() > 0) {
-    while (ob_end_clean());
-}
-
-define("DEFAULT_COUNTRY_ID",392);
+define("DEFAULT_COUNTRY_ID", 392);
 
 require_once HTML_REALDIR . HTML2DATA_DIR . 'require_base.php';

branches/version-2_13-dev/html/require.php

@@ -33 +33 @@
 
 require_once HTML_REALDIR . 'define.php';
-if (ob_get_level() > 0 && ob_get_length() > 0) {
-    while (ob_end_clean());
-}
 require_once HTML_REALDIR . HTML2DATA_DIR . 'require_base.php';
 

branches/version-2_13-dev/tests/class/Common_TestCase.php

@@ -29 +29 @@
     protected function setUp()
     {
-      $this->objQuery = SC_Query_Ex::getSingletonInstance('', true);
-      $this->objQuery->begin();
+        $this->objQuery = SC_Query_Ex::getSingletonInstance('', true);
+        $this->objQuery->begin();
     }
 
@@ -65 +65 @@
         $this->verify('exitしたかどうか');
     }
-    */
+     */
 
     /**
@@ -84 +84 @@
         $this->verify('端末種別');
     }
-    */
+     */
 
     /**
@@ -103 +103 @@
         $this->verify('ログイン状態');
     }
-    */
+     */
 }