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

Merge pull request #9744 from creative-commoners/pulls/4/improve-scalar-response-handling

Browse Source 
Scalar fixes
This commit is contained in:
Steve Boyd 2020-10-28 18:33:33 +13:00 committed by GitHub
commit cf79be8e2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 76 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Control/Controller.php
View File

@ -230,7 +230,9 @@ class Controller extends RequestHandler implements TemplateGlobalProvider
*/ */
protected function prepareResponse($response) protected function prepareResponse($response)
{ {
if ($response instanceof HTTPResponse) { if (!is_object($response)) {
$this->getResponse()->setBody($response);
} elseif ($response instanceof HTTPResponse) {
if (isset($_REQUEST['debug_request'])) { if (isset($_REQUEST['debug_request'])) {
$class = static::class; $class = static::class;
Debug::message( Debug::message(

2
src/Core/ClassInfo.php
View File

@ -400,7 +400,7 @@ class ClassInfo
*/ */
public static function hasMethod($object, $method) public static function hasMethod($object, $method)
{ {
if (empty($object)) { if (empty($object) || (!is_object($object) && !is_string($object))) {
return false; return false;
} }
if (method_exists($object, $method)) { if (method_exists($object, $method)) {

56
tests/php/Core/ClassInfoTest.php
View File

@ -2,6 +2,7 @@
namespace SilverStripe\Core\Tests; namespace SilverStripe\Core\Tests;
use DateTime;
use ReflectionException; use ReflectionException;
use SilverStripe\Core\ClassInfo; use SilverStripe\Core\ClassInfo;
use SilverStripe\Core\Tests\ClassInfoTest\BaseClass; use SilverStripe\Core\Tests\ClassInfoTest\BaseClass;
@ -15,6 +16,7 @@ use SilverStripe\Core\Tests\ClassInfoTest\ExtensionTest1;
use SilverStripe\Core\Tests\ClassInfoTest\ExtensionTest2; use SilverStripe\Core\Tests\ClassInfoTest\ExtensionTest2;
use SilverStripe\Core\Tests\ClassInfoTest\GrandChildClass; use SilverStripe\Core\Tests\ClassInfoTest\GrandChildClass;
use SilverStripe\Core\Tests\ClassInfoTest\HasFields; use SilverStripe\Core\Tests\ClassInfoTest\HasFields;
use SilverStripe\Core\Tests\ClassInfoTest\HasMethod;
use SilverStripe\Core\Tests\ClassInfoTest\NoFields; use SilverStripe\Core\Tests\ClassInfoTest\NoFields;
use SilverStripe\Core\Tests\ClassInfoTest\WithCustomTable; use SilverStripe\Core\Tests\ClassInfoTest\WithCustomTable;
use SilverStripe\Core\Tests\ClassInfoTest\WithRelation; use SilverStripe\Core\Tests\ClassInfoTest\WithRelation;
@ -266,9 +268,57 @@ class ClassInfoTest extends SapphireTest
); );
} }
/** /** @dataProvider provideHasMethodCases */
* @dataProvider provideClassSpecCases public function testHasMethod($object, $method, $output)
*/ {
$this->assertEquals(
$output,
ClassInfo::hasMethod($object, $method)
);
}
public function provideHasMethodCases()
{
return [
'Basic object' => [
new DateTime(),
'format',
true,
],
'CustomMethod object' => [
new HasMethod(),
'example',
true,
],
'Class Name' => [
'DateTime',
'format',
true,
],
'FQCN' => [
'\DateTime',
'format',
true,
],
'Invalid FQCN' => [
'--GreatTime',
'format',
false,
],
'Integer' => [
1,
'format',
false,
],
'Array' => [
['\DateTime'],
'format',
false,
],
];
}
/** @dataProvider provideClassSpecCases */
public function testParseClassSpec($input, $output) public function testParseClassSpec($input, $output)
{ {
$this->assertEquals( $this->assertEquals(

19
tests/php/Core/ClassInfoTest/HasMethod.php Normal file
View File

@ -0,0 +1,19 @@
<?php
namespace SilverStripe\Core\Tests\ClassInfoTest;
use SilverStripe\Core\CustomMethods;
use SilverStripe\Dev\TestOnly;
/**
* Example of class with hasMethod() implementation
*/
class HasMethod implements TestOnly
{
use CustomMethods;
public function example()
{
return true;
}
}