tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: Remove checks for PHP < 5.3.2, as it's no longer supported

Browse Source
This commit is contained in:
Andrew O'Neil 2012-04-18 10:38:09 +12:00
parent cc7a012139
commit 14c0796617
4 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/manifest/ClassManifest.php
View File

@ -331,18 +331,15 @@ class SS_ClassManifest {
if (!$classes) {
$tokens = token_get_all($file);
if(version_compare(PHP_VERSION, '5.3', '>=')) {
$classes = self::get_namespaced_class_parser()->findAll($tokens);
$namespace = self::get_namespace_parser()->findAll($tokens);
if($namespace) {
$namespace = implode('', $namespace[0]['namespaceName']) . '\\';
} else {
$namespace = '';
}
$classes = self::get_namespaced_class_parser()->findAll($tokens);
$namespace = self::get_namespace_parser()->findAll($tokens);
if($namespace) {
$namespace = implode('', $namespace[0]['namespaceName']) . '\\';
} else {
$classes = self::get_class_parser()->findAll($tokens);
$namespace = '';
}
$interfaces = self::get_interface_parser()->findAll($tokens);
$cache = array('classes' => $classes, 'interfaces' => $interfaces, 'namespace' => $namespace);

7
security/RandomGenerator.php
View File

@ -21,11 +21,8 @@ class RandomGenerator {
// TODO Fails with "Could not gather sufficient random data" on IIS, temporarily disabled on windows
if(!$isWin) {
// mcrypt with urandom is only available on PHP 5.3 or newer
if(version_compare(PHP_VERSION, '5.3.0', '>=') && function_exists('mcrypt_create_iv')) {
$e = mcrypt_create_iv(64, MCRYPT_DEV_URANDOM);
if($e !== false) return $e;
}
$e = mcrypt_create_iv(64, MCRYPT_DEV_URANDOM);
if($e !== false) return $e;
}
// Fall back to SSL methods - may slow down execution by a few ms

4
tests/core/manifest/NamespacedClassManifestTest.php
View File

@ -13,10 +13,6 @@ class NamespacedClassManifestTest extends SapphireTest {
public function setUp() {
parent::setUp();
if(version_compare(PHP_VERSION, '5.3', '<')) {
$this->markTestSkipped('Namespaces are not supported before PHP 5.3');
}
$this->base = dirname(__FILE__) . '/fixtures/namespaced_classmanifest';
$this->manifest = new SS_ClassManifest($this->base, false, true, false);
}

6
tests/core/manifest/TokenisedRegularExpressionTest.php
View File

@ -122,9 +122,6 @@ PHP
}
function testNamesapcedClassDefParser() {
if(version_compare(PHP_VERSION, '5.3', '<')) {
return;
}
$parser = SS_ClassManifest::get_namespaced_class_parser();
$tokens = $this->getNamespaceTokens();
@ -167,9 +164,6 @@ PHP
}
function testNamespaceDefParser() {
if(version_compare(PHP_VERSION, '5.3', '<')) {
return;
}
$parser = SS_ClassManifest::get_namespace_parser();
$namespacedTokens = $this->getNamespaceTokens();