Merge pull request #27 from quant-php/dev

Dev

Author: ThorstenSuckow

README.md

@@ -1,8 +1,15 @@
-# quant-php/quant
+# quant<sup>php</sup>
+all-purpose library for a general-purpose scripting language.
 
+quant is a library for PHP >= 8.2. It is a result of [conjoon](https://conjoon.org) and several other open / closed 
+source projects, where functionality has proven useful to justify a refactoring into a shared library.
 
-## Installation 
+## Installation
 
 ```bash
 $ composer require quant-php/quant
-```
+```
+
+## Documentation
+The docs for the project can be found at https://quant-php.dev.
+

composer.lock

@@ -13,6 +13,9 @@
     <testsuite name="Quant Test Suite">
       <directory>./src/Quant/Core/Tests/</directory>
     </testsuite>
+    <testsuite name="PHPStan Test Suite">
+      <directory>./src/Quant/PHPStan/Tests/</directory>
+    </testsuite>
   </testsuites>
 
   <php>

phpunit.xml

@@ -74,11 +74,24 @@ public function testSettersAndGettersForClass(): void
 
         $this->assertSame("foo", $inst->getFoo());
         $this->assertSame("bar", $inst->getBar());
-        $this->assertSame("snafu", $inst->getSnafu());
         $this->assertSame("foobar", $inst->getFoobar());
     }
 
 
+    public function testGetSnafuModifierOverridden(): void
+    {
+        $inst = $this->createClassWithSetterAndGetterAttributes([
+            "foo" => "Hello World",
+            "bar" => "World Hello"
+        ]);
+
+        $this->expectException(BadMethodCallException::class);
+
+        /* @phpstan-ignore-next-line */
+        $inst->getSnafu();
+    }
+
+
     public function testAccessorTraitWithDifferentValues(): void
     {
         $this->expectException(ValueError::class);

src/Quant/Core/Tests/Trait/AccessorTraitTest.php

@@ -27,7 +27,7 @@ class ClassHasAttributes
     #[Setter]
     public string $foobar = "Ok";
 
-    #[Getter]
+    #[Getter(Modifier::PRIVATE)]
     private string $snafu;
 
     public function __construct(

src/Quant/Core/Tests/Trait/Resources/ClassHasAttributes.php

@@ -245,10 +245,9 @@ private function cachePropertiesWithAccessorAttribute(string $accessorClass): ar
                 continue;
             }
 
-            $accessorAttribute = $classAccessorAttribute;
-
+            $accessorAttribute = $property->getAttributes($accessorClass);
             if (empty($accessorAttribute)) {
-                $accessorAttribute = $property->getAttributes($accessorClass);
+                $accessorAttribute = $classAccessorAttribute;
             }
 
             if (!empty($accessorAttribute) && ($property instanceof ReflectionProperty)) {

src/Quant/Core/Trait/AccessorTrait.php

@@ -132,9 +132,9 @@ protected function getPropertyConfig(ClassReflection $classReflection, string $m
                 return null;
             }
 
-            if (empty($classAttributes)) {
-                $attributes = $reflectionProperty->getAttributes($prefix === "set" ? Setter::class : Getter::class);
-            } else {
+            $attributes = $reflectionProperty->getAttributes($prefix === "set" ? Setter::class : Getter::class);
+
+            if (empty($attributes)) {
                 $attributes = $classAttributes;
             }
 

src/Quant/PHPStan/Reflection/QuantAccessorMethodReflectionExtension.php

@@ -26,5 +26,6 @@ class D
 
     private string $foo;
 
+    #[Setter(Modifier::PRIVATE)]
     private string $bar;
 }

src/Quant/PHPStan/Tests/Data/D.php

@@ -52,6 +52,7 @@ public function testRule(): void
         ]);
 
         $this->analyse([__DIR__ . "../../Data/ChildD.php"], [
+            ["Call to private method setBar() of class Quant\PHPStan\Tests\Data\D.", 27]
         ]);
     }
 }