Re-organize / format code #3

symbiote · May 16, 2018 · 370e5db · 370e5db
1 parent 67d238a
commit 370e5db
Show file tree

Hide file tree

Showing 17 changed files with 29 additions and 13 deletions.
diff --git a/src/ConfigHelper.php b/src/ConfigHelper.php
@@ -19,6 +19,17 @@ public static function get($className, $configKey)
         return Config::inst()->get($className, $configKey);
     }
 
+    /**
+     * @param string $className
+     * @param string $configKey
+     * @param string $configValue
+     * @return array|scalar
+     */
+    public static function update($className, $configKey, $configValue)
+    {
+        return Config::inst()->update($className, $configKey, $configValue);
+    }
+
     /**
      * @param string $className
      * @return ObjectType[]

diff --git a/...reeMethodClassReflectionExtensionTest.php → ...reeMethodClassReflectionExtensionTest.php b/...reeMethodClassReflectionExtensionTest.php → ...reeMethodClassReflectionExtensionTest.php
diff --git a/...ePropertyClassReflectionExtensionTest.php → ...ePropertyClassReflectionExtensionTest.php b/...ePropertyClassReflectionExtensionTest.php → ...ePropertyClassReflectionExtensionTest.php
diff --git a/tests/RequestFilterBad.php → tests/Rule/Data/RequestFilterBad.php b/tests/RequestFilterBad.php → tests/Rule/Data/RequestFilterBad.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PHPStan;
+namespace SilbinaryWolf\SilverstripePHPStan\Tests\Data;
 
 // SilverStripe
 use RequestFilter;

diff --git a/tests/RequestFilterGood.php → tests/Rule/Data/RequestFilterGood.php b/tests/RequestFilterGood.php → tests/Rule/Data/RequestFilterGood.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PHPStan;
+namespace SilbinaryWolf\SilverstripePHPStan\Tests\Data;
 
 // SilverStripe
 use RequestFilter;

diff --git a/tests/RequestFilterPreRequestRuleTest.php → .../Rule/RequestFilterPreRequestRuleTest.php b/tests/RequestFilterPreRequestRuleTest.php → .../Rule/RequestFilterPreRequestRuleTest.php
@@ -3,6 +3,7 @@
 namespace SilbinaryWolf\SilverstripePHPStan\Tests;
 
 use SilbinaryWolf\SilverstripePHPStan\Rule\RequestFilterPreRequestRule;
+use SilbinaryWolf\SilverstripePHPStan\Tests\ResolverTest;
 use PHPStan\Rules\Rule;
 
 class RequestFilterPreRequestRuleTest extends \PHPStan\Testing\RuleTestCase
@@ -15,12 +16,12 @@ protected function getRule(): Rule
 
     public function testRequestFilterGood(): void
     {
-        $this->analyse([__DIR__ . '/RequestFilterGood.php'], []);
+        $this->analyse([__DIR__ . '/Data/RequestFilterGood.php'], []);
     }
 
     public function testRequestFilterBad(): void
     {
-        $this->analyse([__DIR__ . '/RequestFilterBad.php'], [
+        $this->analyse([__DIR__ . '/Data/RequestFilterBad.php'], [
             [
                 'RequestFilter::preRequest() should not return false as this will cause an uncaught "Invalid Request" exception to be thrown by the SilverStripe framework. (returning "null" will not cause this problem)',
                 21,

diff --git a/...FieldGetStaticReturnTypeExtensionTest.php → ...FieldGetStaticReturnTypeExtensionTest.php b/...FieldGetStaticReturnTypeExtensionTest.php → ...FieldGetStaticReturnTypeExtensionTest.php
@@ -4,6 +4,7 @@
 
 use SilbinaryWolf\SilverstripePHPStan\Type\DBFieldStaticReturnTypeExtension;
 use SilbinaryWolf\SilverstripePHPStan\ClassHelper;
+use SilbinaryWolf\SilverstripePHPStan\Tests\ResolverTest;
 
 class DBFieldGetStaticReturnTypeExtensionTest extends ResolverTest
 {

diff --git a/tests/DataListReturnTypeExtensionTest.php → .../Type/DataListReturnTypeExtensionTest.php b/tests/DataListReturnTypeExtensionTest.php → .../Type/DataListReturnTypeExtensionTest.php
@@ -5,6 +5,7 @@
 use SilbinaryWolf\SilverstripePHPStan\Type\DataListReturnTypeExtension;
 use SilbinaryWolf\SilverstripePHPStan\Type\DataObjectGetStaticReturnTypeExtension;
 use SilbinaryWolf\SilverstripePHPStan\ClassHelper;
+use SilbinaryWolf\SilverstripePHPStan\Tests\ResolverTest;
 
 class DataListReturnTypeExtensionTest extends ResolverTest
 {

diff --git a/...bjectGetStaticReturnTypeExtensionTest.php → ...bjectGetStaticReturnTypeExtensionTest.php b/...bjectGetStaticReturnTypeExtensionTest.php → ...bjectGetStaticReturnTypeExtensionTest.php
@@ -4,6 +4,7 @@
 
 use SilbinaryWolf\SilverstripePHPStan\Type\DataObjectGetStaticReturnTypeExtension;
 use SilbinaryWolf\SilverstripePHPStan\ClassHelper;
+use SilbinaryWolf\SilverstripePHPStan\Tests\ResolverTest;
 
 class DataObjectGetStaticReturnTypeExtensionTest extends ResolverTest
 {

diff --git a/tests/DataObjectReturnTypeExtensionTest.php → ...ype/DataObjectReturnTypeExtensionTest.php b/tests/DataObjectReturnTypeExtensionTest.php → ...ype/DataObjectReturnTypeExtensionTest.php
@@ -4,6 +4,7 @@
 
 use SilbinaryWolf\SilverstripePHPStan\Type\DataObjectReturnTypeExtension;
 use SilbinaryWolf\SilverstripePHPStan\ClassHelper;
+use SilbinaryWolf\SilverstripePHPStan\Tests\ResolverTest;
 
 class DataObjectReturnTypeExtensionTest extends ResolverTest
 {

diff --git a/tests/ExtensionReturnTypeExtensionTest.php → ...Type/ExtensionReturnTypeExtensionTest.php b/tests/ExtensionReturnTypeExtensionTest.php → ...Type/ExtensionReturnTypeExtensionTest.php
@@ -3,9 +3,8 @@
 namespace SilbinaryWolf\SilverstripePHPStan\Tests;
 
 use SilbinaryWolf\SilverstripePHPStan\Type\ExtensionReturnTypeExtension;
-
-// SilverStripe
-use Config;
+use SilbinaryWolf\SilverstripePHPStan\ConfigHelper;
+use SilbinaryWolf\SilverstripePHPStan\Tests\ResolverTest;
 
 class ExtensionReturnTypeExtensionTest extends ResolverTest
 {
@@ -35,7 +34,7 @@ public function testDynamicMethodReturnTypeExtensions(
             new ExtensionReturnTypeExtension(),
         ];
         $dynamicStaticMethodReturnTypeExtensions = [];
-        Config::inst()->update(
+        ConfigHelper::update(
             \DataExtensionDynamicMethodReturnTypesNamespace\Foo::class,
             'extensions',
             [
@@ -85,12 +84,12 @@ public function testUnionDynamicMethodReturnTypeExtensions(
         $extensions = [
             \DataExtensionUnionDynamicMethodReturnTypesNamespace\FooDataExtension::class,
         ];
-        Config::inst()->update(
+        ConfigHelper::update(
             \DataExtensionUnionDynamicMethodReturnTypesNamespace\Foo::class,
             'extensions',
             $extensions
         );
-        Config::inst()->update(
+        ConfigHelper::update(
             \DataExtensionUnionDynamicMethodReturnTypesNamespace\FooTwo::class,
             'extensions',
             $extensions

diff --git a/tests/InjectorReturnTypeExtensionTest.php → .../Type/InjectorReturnTypeExtensionTest.php b/tests/InjectorReturnTypeExtensionTest.php → .../Type/InjectorReturnTypeExtensionTest.php
@@ -3,8 +3,9 @@
 namespace SilbinaryWolf\SilverstripePHPStan\Tests;
 
 use SilbinaryWolf\SilverstripePHPStan\Type\InjectorReturnTypeExtension;
-use \SilbinaryWolf\SilverstripePHPStan\Type\SingletonReturnTypeExtension;
+use SilbinaryWolf\SilverstripePHPStan\Type\SingletonReturnTypeExtension;
 use SilbinaryWolf\SilverstripePHPStan\ClassHelper;
+use SilbinaryWolf\SilverstripePHPStan\Tests\ResolverTest;
 
 class InjectorReturnTypeExtensionTest extends ResolverTest
 {

diff --git a/...extension-dynamic-method-return-types.php → ...extension-dynamic-method-return-types.php b/...extension-dynamic-method-return-types.php → ...extension-dynamic-method-return-types.php
diff --git a/...ion-union-dynamic-method-return-types.php → ...ion-union-dynamic-method-return-types.php b/...ion-union-dynamic-method-return-types.php → ...ion-union-dynamic-method-return-types.php
diff --git a/tests/data/data-list-return-types.php → tests/Type/data/data-list-return-types.php b/tests/data/data-list-return-types.php → tests/Type/data/data-list-return-types.php
diff --git a/...ta-object-dynamic-method-return-types.php → ...ta-object-dynamic-method-return-types.php b/...ta-object-dynamic-method-return-types.php → ...ta-object-dynamic-method-return-types.php
diff --git a/tests/bootstrap-phpunit.php b/tests/bootstrap-phpunit.php
@@ -14,5 +14,5 @@
 require_once(__DIR__.'/../bootstrap.php');
 
 // Used by: RequestFilterPreRequestRuleTest
-require_once(__DIR__.'/RequestFilterBad.php');
-require_once(__DIR__.'/RequestFilterGood.php');
+require_once(__DIR__.'/Rule/data/RequestFilterBad.php');
+require_once(__DIR__.'/Rule/data/RequestFilterGood.php');