Added DNF type support #505

krzysztof-ciszewski · 2024-05-19T14:59:30Z

TODO:

tests
domain exceptions

scrutinizer-notifier · 2024-05-19T14:59:38Z

Nitpick-CI · 2024-05-19T15:00:12Z

src/Aop/Pointcut/AndPointcut.php

+            $pointcuts = array_slice($args, 1);
+        }
+
+        if (count(array_filter($pointcuts, static fn ($pointcut) => $pointcut instanceof Pointcut)) !== count($pointcuts)) {


Space before opening parenthesis of function call prohibited

Nitpick-CI · 2024-05-19T15:00:13Z

src/Aop/Pointcut/DNF/AST/Node.php

@@ -0,0 +1,14 @@
+<?php


End of line character is invalid; expected \n but found \r\n

Nitpick-CI · 2024-05-19T15:00:14Z

src/Aop/Pointcut/DNF/AST/Node.php

+readonly class Node
+{
+    public function __construct(
+        public NodeType $type,


Line indented incorrectly; expected 4 spaces, found 8

Nitpick-CI · 2024-05-19T15:00:14Z

src/Aop/Pointcut/DNF/AST/Node.php

+{
+    public function __construct(
+        public NodeType $type,
+        public ?string $identifier = null,


Line indented incorrectly; expected 4 spaces, found 8

Nitpick-CI · 2024-05-19T15:00:15Z

src/Aop/Pointcut/DNF/AST/Node.php

+    public function __construct(
+        public NodeType $type,
+        public ?string $identifier = null,
+        public ?Node $left = null,


Line indented incorrectly; expected 4 spaces, found 8

Nitpick-CI · 2024-05-19T15:00:16Z

src/Aop/Pointcut/DNF/AST/Node.php

+        public NodeType $type,
+        public ?string $identifier = null,
+        public ?Node $left = null,
+        public ?Node $right = null,


Line indented incorrectly; expected 4 spaces, found 8

Nitpick-CI · 2024-05-19T15:00:17Z

src/Aop/Pointcut/DNF/AST/NodeType.php

@@ -0,0 +1,10 @@
+<?php


End of line character is invalid; expected \n but found \r\n

Nitpick-CI · 2024-05-19T15:00:17Z

src/Aop/Pointcut/DNF/AST/NodeType.php

+enum NodeType
+{
+    case IDENTIFIER;
+    case AND;


PHP keywords must be lowercase; expected and but found AND

Nitpick-CI · 2024-05-19T15:00:18Z

src/Aop/Pointcut/DNF/AST/NodeType.php

+{
+    case IDENTIFIER;
+    case AND;
+    case OR;


PHP keywords must be lowercase; expected or but found OR

Nitpick-CI · 2024-05-19T15:00:19Z

src/Aop/Pointcut/DNF/Parser/Token.php

@@ -0,0 +1,13 @@
+<?php


End of line character is invalid; expected \n but found \r\n

Nitpick-CI · 2024-05-19T15:00:19Z

src/Aop/Pointcut/DNF/Parser/Token.php

+    case IDENTIFIER;
+    case LPAREN;
+    case RPAREN;
+    case AND;


PHP keywords must be lowercase; expected and but found AND

Nitpick-CI · 2024-05-19T15:00:20Z

src/Aop/Pointcut/DNF/Parser/Token.php

+    case LPAREN;
+    case RPAREN;
+    case AND;
+    case OR;


PHP keywords must be lowercase; expected or but found OR

Nitpick-CI · 2024-05-19T15:00:21Z

src/Aop/Pointcut/DNF/Parser/TokenCollection.php

@@ -0,0 +1,74 @@
+<?php


End of line character is invalid; expected \n but found \r\n

Nitpick-CI · 2024-05-19T15:00:21Z

src/Aop/Pointcut/DNF/Parser/TokenCollection.php

@@ -0,0 +1,74 @@
+<?php
+
+namespace Go\Aop\Pointcut\DNF\Parser;


There must be one blank line after the namespace declaration

Nitpick-CI · 2024-05-19T15:00:22Z

src/Aop/Pointcut/DNF/Parser/TokenCollection.php

+     * @param \ArrayIterator<\PhpToken> $tokens
+     */
+    public function __construct(
+        private readonly \ArrayIterator $tokens


Line indented incorrectly; expected 4 spaces, found 8

Nitpick-CI · 2024-05-19T15:00:23Z

src/Aop/Pointcut/DNF/Parser/TokenCollection.php

+
+    private function getToken(string $val): Token
+    {
+        return match ($val) {


Space before opening parenthesis of function call prohibited

Nitpick-CI · 2024-05-19T15:00:24Z

src/Aop/Pointcut/DNF/Parser/TokenCollection.php

+            chr(26) => Token::EOF,
+            '(' => Token::LPAREN,
+            ')' => Token::RPAREN,
+            '|' => Token::OR,


PHP keywords must be lowercase; expected or but found OR

Nitpick-CI · 2024-05-19T15:00:24Z

src/Aop/Pointcut/DNF/Parser/TokenCollection.php

+            '(' => Token::LPAREN,
+            ')' => Token::RPAREN,
+            '|' => Token::OR,
+            '&' => Token::AND,


PHP keywords must be lowercase; expected and but found AND

Nitpick-CI · 2024-05-19T15:00:25Z

src/Aop/Pointcut/DNF/Parser/TokenCollection.php

+            ')' => Token::RPAREN,
+            '|' => Token::OR,
+            '&' => Token::AND,
+            default => Token::IDENTIFIER


Line indented incorrectly; expected 8 spaces, found 12

Nitpick-CI · 2024-05-19T15:00:26Z

src/Aop/Pointcut/DNF/Parser/TokenCollectionInterface.php

@@ -0,0 +1,21 @@
+<?php


End of line character is invalid; expected \n but found \r\n

Nitpick-CI · 2024-05-19T15:00:27Z

src/Aop/Pointcut/DNF/Parser/TokenCollectionInterface.php

+     * @return array{0: Token, 1: string|null}
+     */
+    public function peek(int $i): array;
+}


Expected 1 newline at end of file; 0 found

Nitpick-CI · 2024-05-19T15:00:27Z

src/Aop/Pointcut/DNF/Parser/TokenizerParser.php

@@ -0,0 +1,113 @@
+<?php


End of line character is invalid; expected \n but found \r\n

Nitpick-CI · 2024-05-19T15:00:28Z

src/Aop/Pointcut/DNF/Parser/TokenizerParser.php

+        TokenCollection $tokens,
+        int $bindingPower,
+        bool $insideParenthesis = false
+    ): ?Node {


There must be a single space between the closing parenthesis and the opening brace of a multi-line function declaration; found 0 spaces

Nitpick-CI · 2024-05-19T15:00:29Z

src/Aop/Pointcut/DNF/Parser/TokenizerParser.php

+    ): ?Node {
+        [$token, $val] = $tokens->next();
+        switch ($token) {
+            case Token::LPAREN:


CASE statements must be defined using a colon

Nitpick-CI · 2024-05-19T15:00:29Z

src/Aop/Pointcut/DNF/Parser/TokenizerParser.php

+        while (true) {
+            [$token] = $tokens->peek(0);
+
+            if ($token === Token::OR && $insideParenthesis) {


PHP keywords must be lowercase; expected or but found OR

Nitpick-CI · 2024-05-19T15:00:30Z

src/Aop/Pointcut/DNF/Parser/TokenizerParser.php

+            }
+
+            switch ($token) {
+                case Token::OR:


PHP keywords must be lowercase; expected or but found OR

Nitpick-CI · 2024-05-19T15:00:32Z

src/Aop/Pointcut/DNF/Parser/TokenizerParser.php

+
+            switch ($token) {
+                case Token::OR:
+                case Token::AND:


PHP keywords must be lowercase; expected and but found AND

Nitpick-CI · 2024-05-19T15:00:33Z

src/Aop/Pointcut/DNF/Parser/TokenizerParser.php

+
+    private function operatorNode(Token $type, Node $left, ?Node $right): Node
+    {
+        return match ($type) {


Space before opening parenthesis of function call prohibited

Nitpick-CI · 2024-05-19T15:00:33Z

src/Aop/Pointcut/DNF/Parser/TokenizerParser.php

+    private function operatorNode(Token $type, Node $left, ?Node $right): Node
+    {
+        return match ($type) {
+            Token::OR => new Node(NodeType::OR, left: $left, right: $right),


PHP keywords must be lowercase; expected or but found OR

Nitpick-CI · 2024-05-19T15:00:34Z

src/Aop/Pointcut/DNF/Parser/TokenizerParser.php

+    {
+        return match ($type) {
+            Token::OR => new Node(NodeType::OR, left: $left, right: $right),
+            Token::AND => new Node(NodeType::AND, left: $left, right: $right),


PHP keywords must be lowercase; expected and but found AND

Nitpick-CI · 2024-05-19T15:00:35Z

src/Aop/Pointcut/DNF/Parser/TokenizerParser.php

+        return match ($type) {
+            Token::OR => new Node(NodeType::OR, left: $left, right: $right),
+            Token::AND => new Node(NodeType::AND, left: $left, right: $right),
+            default => throw new Exception('invalid op')


Line indented incorrectly; expected 8 spaces, found 12

Nitpick-CI · 2024-05-19T15:00:36Z

src/Aop/Pointcut/DNF/Parser/TokenizerParser.php

+     */
+    private function getBindingPower(Token $type): array
+    {
+        return match ($type) {


Space before opening parenthesis of function call prohibited

Nitpick-CI · 2024-05-19T15:00:36Z

src/Aop/Pointcut/DNF/Parser/TokenizerParser.php

+    private function getBindingPower(Token $type): array
+    {
+        return match ($type) {
+            Token::OR => [1, 2],


PHP keywords must be lowercase; expected or but found OR

Nitpick-CI · 2024-05-19T15:00:37Z

src/Aop/Pointcut/DNF/Parser/TokenizerParser.php

+    {
+        return match ($type) {
+            Token::OR => [1, 2],
+            Token::AND => [3, 4],


PHP keywords must be lowercase; expected and but found AND

Nitpick-CI · 2024-05-19T15:00:38Z

src/Aop/Pointcut/DNF/Parser/TokenizerParser.php

+        return match ($type) {
+            Token::OR => [1, 2],
+            Token::AND => [3, 4],
+            default => throw new Exception('Invalid operator')


Line indented incorrectly; expected 8 spaces, found 12

Nitpick-CI · 2024-05-19T15:00:38Z

src/Aop/Pointcut/DNF/Parser/TokenizerParser.php

+        };
+    }
+
+}


Expected 1 newline at end of file; 0 found

The closing brace for the class must go on the next line after the body

Nitpick-CI · 2024-05-19T15:00:39Z

src/Aop/Pointcut/DNF/Parser/TokenizerParserInterface.php

@@ -0,0 +1,8 @@
+<?php


End of line character is invalid; expected \n but found \r\n

Nitpick-CI · 2024-05-19T15:00:40Z

src/Aop/Pointcut/DNF/Parser/TokenizerParserInterface.php

+interface TokenizerParserInterface
+{
+    public function parse(string $input);
+}


Expected 1 newline at end of file; 0 found

Nitpick-CI · 2024-05-19T15:00:40Z

src/Aop/Pointcut/DNF/SemanticAnalyzer.php

@@ -0,0 +1,44 @@
+<?php


End of line character is invalid; expected \n but found \r\n

Nitpick-CI · 2024-05-19T15:00:41Z

src/Aop/Pointcut/DNF/SemanticAnalyzer.php

+                || $val->implementsInterface($tree->identifier);
+        }
+
+        if ($tree?->type === NodeType::AND) {


PHP keywords must be lowercase; expected and but found AND

Nitpick-CI · 2024-05-19T15:01:55Z

src/Aop/Pointcut/DNF/Parser/TokenizerParser.php

+        return match ($type) {
+            Token::OR => new Node(NodeType::OR, left: $left, right: $right),
+            Token::AND => new Node(NodeType::AND, left: $left, right: $right),
+            default => throw new Exception('invalid op')


Line indented incorrectly; expected 8 spaces, found 12

Nitpick-CI · 2024-05-19T15:01:55Z

src/Aop/Pointcut/DNF/Parser/TokenizerParser.php

+     */
+    private function getBindingPower(Token $type): array
+    {
+        return match ($type) {


Space before opening parenthesis of function call prohibited

Nitpick-CI · 2024-05-19T15:01:56Z

src/Aop/Pointcut/DNF/Parser/TokenizerParser.php

+    private function getBindingPower(Token $type): array
+    {
+        return match ($type) {
+            Token::OR => [1, 2],


PHP keywords must be lowercase; expected or but found OR

Nitpick-CI · 2024-05-19T15:01:57Z

src/Aop/Pointcut/DNF/Parser/TokenizerParser.php

+    {
+        return match ($type) {
+            Token::OR => [1, 2],
+            Token::AND => [3, 4],


PHP keywords must be lowercase; expected and but found AND

Nitpick-CI · 2024-05-19T15:01:57Z

src/Aop/Pointcut/DNF/Parser/TokenizerParser.php

+        return match ($type) {
+            Token::OR => [1, 2],
+            Token::AND => [3, 4],
+            default => throw new Exception('Invalid operator')


Line indented incorrectly; expected 8 spaces, found 12

Nitpick-CI · 2024-05-19T15:01:58Z

src/Aop/Pointcut/DNF/Parser/TokenizerParser.php

+        };
+    }
+
+}


Expected 1 newline at end of file; 0 found

The closing brace for the class must go on the next line after the body

Nitpick-CI · 2024-05-19T15:01:58Z

src/Aop/Pointcut/DNF/Parser/TokenizerParserInterface.php

@@ -0,0 +1,8 @@
+<?php


End of line character is invalid; expected \n but found \r\n

Nitpick-CI · 2024-05-19T15:01:59Z

src/Aop/Pointcut/DNF/Parser/TokenizerParserInterface.php

+interface TokenizerParserInterface
+{
+    public function parse(string $input);
+}


Expected 1 newline at end of file; 0 found

Nitpick-CI · 2024-05-19T15:02:00Z

src/Aop/Pointcut/DNF/SemanticAnalyzer.php

@@ -0,0 +1,44 @@
+<?php


End of line character is invalid; expected \n but found \r\n

Nitpick-CI · 2024-05-19T15:02:01Z

src/Aop/Pointcut/DNF/SemanticAnalyzer.php

+                || $val->implementsInterface($tree->identifier);
+        }
+
+        if ($tree?->type === NodeType::AND) {


PHP keywords must be lowercase; expected and but found AND

Nitpick-CI · 2024-05-19T15:02:01Z

src/Aop/Pointcut/DNF/SemanticAnalyzer.php

+            return $this->verifyTree($tree->left, $val) && $this->verifyTree($tree->right, $val);
+        }
+
+        if ($tree->type === NodeType::OR) {


PHP keywords must be lowercase; expected or but found OR

Nitpick-CI · 2024-05-19T15:02:02Z

src/Aop/Pointcut/DNF/SemanticAnalyzer.php

+
+        return $parentClasses;
+    }
+}


Expected 1 newline at end of file; 0 found

Nitpick-CI · 2024-05-19T15:02:03Z

src/Aop/Pointcut/DNF/SemanticAnalyzerInterface.php

@@ -0,0 +1,11 @@
+<?php


End of line character is invalid; expected \n but found \r\n

Nitpick-CI · 2024-05-19T15:02:04Z

src/Aop/Pointcut/DNF/SemanticAnalyzerInterface.php

+interface SemanticAnalyzerInterface
+{
+    public function verifyTree(Node $tree, \ReflectionClass|ReflectionFileNamespace $val);
+}


Expected 1 newline at end of file; 0 found

Nitpick-CI · 2024-05-19T15:02:04Z

src/Aop/Pointcut/PointcutGrammar.php

-            ->call(fn($parentClassName) => new ClassInheritancePointcut($parentClassName))
+            ->call(static function (...$args) {
+                return array_map(
+                    static fn (string $class) => new ClassInheritancePointcut($class),


Line indented incorrectly; expected 16 spaces, found 20

Space before opening parenthesis of function call prohibited

Nitpick-CI · 2024-05-19T15:02:05Z

src/Aop/Pointcut/PointcutGrammar.php

@@ -301,6 +305,12 @@ function () {
            ->call($stringConverter)
            ->is('namespacePattern', 'nsSeparator', '**')
            ->call($stringConverter)
+            ->is('namespacePattern', '&', 'namespacePattern')
+            ->call($stringConverter)
+            ->is('(' , 'namespacePattern', '&', 'namespacePattern', ')')


Space found before comma in function call

krzysztof-ciszewski · 2024-05-19T18:43:52Z

@lisachenko I would suggest disabling nitpick, seems pretty outdated, most of these comments are wrong

Added DNF types support

bb52e47

krzysztof-ciszewski marked this pull request as draft May 19, 2024 14:59

Nitpick-CI reviewed May 19, 2024

View reviewed changes

src/Aop/Pointcut/DNF/AST/Node.php

@@ -0,0 +1,14 @@

<?php

Copy link

Nitpick-CI May 19, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

End of line character is invalid; expected \n but found \r\n

Nitpick-CI reviewed May 19, 2024

View reviewed changes

src/Aop/Pointcut/DNF/AST/NodeType.php

@@ -0,0 +1,10 @@

<?php

Copy link

Nitpick-CI May 19, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

End of line character is invalid; expected \n but found \r\n

Nitpick-CI reviewed May 19, 2024

View reviewed changes

src/Aop/Pointcut/DNF/AST/NodeType.php

{

case IDENTIFIER;

case AND;

case OR;

Copy link

Nitpick-CI May 19, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PHP keywords must be lowercase; expected or but found OR

Nitpick-CI reviewed May 19, 2024

View reviewed changes

src/Aop/Pointcut/DNF/Parser/Token.php

@@ -0,0 +1,13 @@

<?php

Copy link

Nitpick-CI May 19, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

End of line character is invalid; expected \n but found \r\n

Nitpick-CI reviewed May 19, 2024

View reviewed changes

src/Aop/Pointcut/DNF/Parser/TokenCollection.php

@@ -0,0 +1,74 @@

<?php

Copy link

Nitpick-CI May 19, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

End of line character is invalid; expected \n but found \r\n

Nitpick-CI reviewed May 19, 2024

View reviewed changes

src/Aop/Pointcut/DNF/Parser/TokenizerParser.php

@@ -0,0 +1,113 @@

<?php

Copy link

Nitpick-CI May 19, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

End of line character is invalid; expected \n but found \r\n

Nitpick-CI reviewed May 19, 2024

View reviewed changes

src/Aop/Pointcut/DNF/SemanticAnalyzer.php

@@ -0,0 +1,44 @@

<?php

Copy link

Nitpick-CI May 19, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

End of line character is invalid; expected \n but found \r\n

Nitpick-CI reviewed May 19, 2024

View reviewed changes

src/Aop/Pointcut/DNF/SemanticAnalyzer.php

@@ -0,0 +1,44 @@

<?php

Copy link

Nitpick-CI May 19, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

End of line character is invalid; expected \n but found \r\n

Nitpick-CI reviewed May 19, 2024

View reviewed changes

src/Aop/Pointcut/DNF/SemanticAnalyzer.php

return $parentClasses;

}

}

Copy link

Nitpick-CI May 19, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Expected 1 newline at end of file; 0 found

Nitpick-CI reviewed May 19, 2024

View reviewed changes

src/Aop/Pointcut/DNF/SemanticAnalyzerInterface.php

@@ -0,0 +1,11 @@

<?php

Copy link

Nitpick-CI May 19, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

End of line character is invalid; expected \n but found \r\n

Nitpick-CI reviewed May 19, 2024

View reviewed changes

+                      };
+                  }
+              }

Added DNF type support #505

Are you sure you want to change the base?

Added DNF type support #505

Conversation

krzysztof-ciszewski commented May 19, 2024

scrutinizer-notifier commented May 19, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

krzysztof-ciszewski commented May 19, 2024