Revert "[BUGFIX] Hook to modify t3lib_div::getIndpEnv return value"
authorChristian Kuhn <lolli@schwarzbu.ch>
Fri, 2 Nov 2012 12:23:17 +0000 (13:23 +0100)
committerChristian Kuhn <lolli@schwarzbu.ch>
Fri, 2 Nov 2012 12:39:19 +0000 (13:39 +0100)
This reverts commit 33e72f56e8e5c4183c1784027639913581b225a9

Related: #39016
Releases: 6.0

Change-Id: I33ffcb206b2d4cac3cd7b683aec8df962c22d593
Reviewed-on: http://review.typo3.org/16127
Reviewed-by: Helmut Hummel
Tested-by: Helmut Hummel
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
typo3/sysext/core/Classes/Utility/GeneralUtility.php
typo3/sysext/core/Tests/Unit/Utility/GeneralUtilityTest.php

index 8374226..059e2be 100644 (file)
@@ -3331,18 +3331,6 @@ Connection: close
                        $retVal = $out;
                        break;
                }
                        $retVal = $out;
                        break;
                }
-
-               if (is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_div.php']['postIndpEnvValue'])) {
-                       $parameters = array(
-                               'retVal' => $retVal,
-                               'getEnvName' => $getEnvName
-                       );
-                       $fakeThis = NULL;
-                       foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_div.php']['postIndpEnvValue'] as $reference) {
-                               self::callUserFunction($reference, $parameters, $fakeThis);
-                       }
-               }
-
                return $retVal;
        }
 
                return $retVal;
        }
 
@@ -4996,4 +4984,5 @@ Connection: close
                }
                echo $obContent;
        }
                }
                echo $obContent;
        }
-}?>
+}
+?>
\ No newline at end of file
index acb4fb5..137379c 100644 (file)
@@ -1599,21 +1599,6 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                $this->assertEquals($expectedPort, Utility\GeneralUtility::getIndpEnv('TYPO3_PORT'));
        }
 
                $this->assertEquals($expectedPort, Utility\GeneralUtility::getIndpEnv('TYPO3_PORT'));
        }
 
-       /**
-        * @test
-        */
-       public function isGetIndpEnvHookCalled() {
-               $hookClassName = uniqid('user_getIndpEnvHook');
-               $hookMock = $this->getMock('stdClass', array('getIndpEnvCustom'), array(), $hookClassName);
-               $hookMock->expects($this->once())->method('getIndpEnvCustom');
-               \TYPO3\CMS\Core\Utility\GeneralUtility::addInstance($hookClassName, $hookMock);
-
-               $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_div.php']['postIndpEnvValue'][$hookClassName] = $hookClassName . '->getIndpEnvCustom';
-
-               \TYPO3\CMS\Core\Utility\GeneralUtility::getIndpEnv('TYPO3_SSL');
-       }
-
-
        //////////////////////////////////
        // Tests concerning underscoredToUpperCamelCase
        //////////////////////////////////
        //////////////////////////////////
        // Tests concerning underscoredToUpperCamelCase
        //////////////////////////////////
@@ -4070,4 +4055,4 @@ text with a ' . $urlMatch . '$|s'),
 
 }
 
 
 }
 
-?>
+?>
\ No newline at end of file