Rollback to beta16

ecedi · Jan 14, 2020 · 8293c6a · 8293c6a
1 parent 527ae84
commit 8293c6a
Show file tree

Hide file tree

Showing 81 changed files with 2,640 additions and 2,865 deletions.
diff --git a/README.md b/README.md
diff --git a/composer.json b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "ecedi/elastic-search-plugin",
+    "name": "sylius/elastic-search-plugin",
     "type": "sylius-bundle",
     "description": "Elastic search integration for Sylius.",
     "license": "MIT",
@@ -12,11 +12,12 @@
     ],
     "require": {
         "php": "^7.1",
+
         "sylius/sylius": "^1.0",
         "ongr/elasticsearch-dsl": "^5.0",
         "ongr/elasticsearch-bundle": "^5.0",
         "simple-bus/symfony-bridge": "^4.1",
-        "ongr/filter-manager-bundle": "^2.1",
+        "ongr/filter-manager-bundle": "2.1.x-dev as v2.1.1",
         "ramsey/uuid": "^3.7"
     },
     "require-dev": {
@@ -39,21 +40,17 @@
         "behat/mink-selenium2-driver": "^1.3",
         "lakion/api-test-case": "^1.1",
         "doctrine/common": "<2.8",
-        "symplify/easy-coding-standard": "^2.4",
-        "sylius-labs/coding-standard": "^1.0"
+        "symplify/easy-coding-standard": "^2.4"
     },
     "config": {
         "bin-dir": "bin"
     },
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "prefer-stable": true,
     "autoload": {
         "psr-4": {
             "Sylius\\ElasticSearchPlugin\\": "src/",
             "Tests\\Sylius\\ElasticSearchPlugin\\": "tests/"
         }
-    },
-    "autoload-dev": {
-        "classmap": ["tests/Application/app/AppKernel.php"]
     }
 }
diff --git a/easy-coding-standard.neon b/easy-coding-standard.neon
@@ -1,2 +1,145 @@
-includes:
-    - vendor/sylius-labs/coding-standard/easy-coding-standard.neon
+checkers:
+    PhpCsFixer\Fixer\Alias\EregToPregFixer: {}
+    PhpCsFixer\Fixer\Alias\NoAliasFunctionsFixer: {}
+    PhpCsFixer\Fixer\Alias\PowToExponentiationFixer: {}
+    PhpCsFixer\Fixer\Alias\NoMixedEchoPrintFixer:
+        use: echo
+    PhpCsFixer\Fixer\ArrayNotation\ArraySyntaxFixer:
+        syntax: short
+    PhpCsFixer\Fixer\ArrayNotation\NoMultilineWhitespaceAroundDoubleArrowFixer: {}
+    PhpCsFixer\Fixer\ArrayNotation\NormalizeIndexBraceFixer: {}
+    PhpCsFixer\Fixer\ArrayNotation\NoTrailingCommaInSinglelineArrayFixer: {}
+    PhpCsFixer\Fixer\ArrayNotation\NoWhitespaceBeforeCommaInArrayFixer: {}
+    PhpCsFixer\Fixer\ArrayNotation\TrailingCommaInMultilineArrayFixer: {}
+    PhpCsFixer\Fixer\ArrayNotation\TrimArraySpacesFixer: {}
+    PhpCsFixer\Fixer\ArrayNotation\WhitespaceAfterCommaInArrayFixer: {}
+    PhpCsFixer\Fixer\Basic\BracesFixer:
+        allow_single_line_closure: true
+    PhpCsFixer\Fixer\Basic\EncodingFixer: {}
+    PhpCsFixer\Fixer\Basic\NonPrintableCharacterFixer: {}
+    PhpCsFixer\Fixer\Casing\LowercaseConstantsFixer: {}
+    PhpCsFixer\Fixer\Casing\LowercaseKeywordsFixer: {}
+    PhpCsFixer\Fixer\Casing\NativeFunctionCasingFixer: {}
+    PhpCsFixer\Fixer\Casing\MagicConstantCasingFixer: {}
+    PhpCsFixer\Fixer\CastNotation\CastSpacesFixer: {}
+    PhpCsFixer\Fixer\CastNotation\LowercaseCastFixer: {}
+    PhpCsFixer\Fixer\CastNotation\ModernizeTypesCastingFixer: {}
+    PhpCsFixer\Fixer\CastNotation\NoShortBoolCastFixer: {}
+    PhpCsFixer\Fixer\CastNotation\ShortScalarCastFixer: {}
+    PhpCsFixer\Fixer\ClassNotation\ClassDefinitionFixer:
+        singleItemSingleLine: true
+        multiLineExtendsEachSingleLine: true
+    PhpCsFixer\Fixer\ClassNotation\MethodSeparationFixer: {}
+    PhpCsFixer\Fixer\ClassNotation\NoBlankLinesAfterClassOpeningFixer: {}
+    PhpCsFixer\Fixer\ClassNotation\NoNullPropertyInitializationFixer: {}
+    PhpCsFixer\Fixer\ClassNotation\NoPhp4ConstructorFixer: {}
+    PhpCsFixer\Fixer\ClassNotation\NoUnneededFinalMethodFixer: {}
+    PhpCsFixer\Fixer\ClassNotation\ProtectedToPrivateFixer: {}
+    PhpCsFixer\Fixer\ClassNotation\SelfAccessorFixer: {}
+    PhpCsFixer\Fixer\ClassNotation\SingleClassElementPerStatementFixer: {}
+    PhpCsFixer\Fixer\ClassNotation\VisibilityRequiredFixer: {}
+    PhpCsFixer\Fixer\Comment\HashToSlashCommentFixer: {}
+    PhpCsFixer\Fixer\Comment\NoEmptyCommentFixer: {}
+    PhpCsFixer\Fixer\Comment\NoTrailingWhitespaceInCommentFixer: {}
+    PhpCsFixer\Fixer\Comment\SingleLineCommentStyleFixer:
+        comment_types: ['hash']
+    PhpCsFixer\Fixer\ControlStructure\ElseifFixer: {}
+    PhpCsFixer\Fixer\ControlStructure\IncludeFixer: {}
+    PhpCsFixer\Fixer\ControlStructure\NoBreakCommentFixer: {}
+    PhpCsFixer\Fixer\ControlStructure\NoSuperfluousElseifFixer: {}
+    PhpCsFixer\Fixer\ControlStructure\NoTrailingCommaInListCallFixer: {}
+    PhpCsFixer\Fixer\ControlStructure\NoUnneededControlParenthesesFixer: {}
+    PhpCsFixer\Fixer\ControlStructure\NoUnneededCurlyBracesFixer: {}
+    PhpCsFixer\Fixer\ControlStructure\NoUselessElseFixer: {}
+    PhpCsFixer\Fixer\ControlStructure\SwitchCaseSemicolonToColonFixer: {}
+    PhpCsFixer\Fixer\ControlStructure\SwitchCaseSpaceFixer: {}
+    PhpCsFixer\Fixer\FunctionNotation\FunctionDeclarationFixer: {}
+    PhpCsFixer\Fixer\FunctionNotation\FunctionTypehintSpaceFixer: {}
+    PhpCsFixer\Fixer\FunctionNotation\MethodArgumentSpaceFixer: {}
+    PhpCsFixer\Fixer\FunctionNotation\NoSpacesAfterFunctionNameFixer: {}
+    PhpCsFixer\Fixer\FunctionNotation\ReturnTypeDeclarationFixer: {}
+    PhpCsFixer\Fixer\Import\NoLeadingImportSlashFixer: {}
+    PhpCsFixer\Fixer\Import\NoUnusedImportsFixer: {}
+    PhpCsFixer\Fixer\Import\OrderedImportsFixer: {}
+    PhpCsFixer\Fixer\Import\SingleImportPerStatementFixer: {}
+    PhpCsFixer\Fixer\Import\SingleLineAfterImportsFixer: {}
+    PhpCsFixer\Fixer\LanguageConstruct\CombineConsecutiveIssetsFixer: {}
+    PhpCsFixer\Fixer\LanguageConstruct\CombineConsecutiveUnsetsFixer: {}
+    PhpCsFixer\Fixer\LanguageConstruct\DeclareEqualNormalizeFixer: {}
+    PhpCsFixer\Fixer\LanguageConstruct\DirConstantFixer: {}
+    PhpCsFixer\Fixer\LanguageConstruct\FunctionToConstantFixer: {}
+    PhpCsFixer\Fixer\LanguageConstruct\IsNullFixer: {}
+    PhpCsFixer\Fixer\LanguageConstruct\SilencedDeprecationErrorFixer: {}
+    PhpCsFixer\Fixer\ListNotation\ListSyntaxFixer:
+        syntax: short
+    PhpCsFixer\Fixer\NamespaceNotation\BlankLineAfterNamespaceFixer: {}
+    PhpCsFixer\Fixer\NamespaceNotation\NoLeadingNamespaceWhitespaceFixer: {}
+    PhpCsFixer\Fixer\NamespaceNotation\SingleBlankLineBeforeNamespaceFixer: {}
+    PhpCsFixer\Fixer\Naming\NoHomoglyphNamesFixer: {}
+    PhpCsFixer\Fixer\Operator\BinaryOperatorSpacesFixer:
+        align_double_arrow: false
+        align_equals: false
+    PhpCsFixer\Fixer\Operator\ConcatSpaceFixer:
+        spacing: one
+    PhpCsFixer\Fixer\Operator\NewWithBracesFixer: {}
+    PhpCsFixer\Fixer\Operator\ObjectOperatorWithoutWhitespaceFixer: {}
+    PhpCsFixer\Fixer\Operator\PreIncrementFixer: {}
+    PhpCsFixer\Fixer\Operator\StandardizeNotEqualsFixer: {}
+    PhpCsFixer\Fixer\Operator\TernaryOperatorSpacesFixer: {}
+    PhpCsFixer\Fixer\Operator\TernaryToNullCoalescingFixer: {}
+    PhpCsFixer\Fixer\Operator\UnaryOperatorSpacesFixer: {}
+    PhpCsFixer\Fixer\Phpdoc\NoBlankLinesAfterPhpdocFixer: {}
+    PhpCsFixer\Fixer\Phpdoc\NoEmptyPhpdocFixer: {}
+    PhpCsFixer\Fixer\Phpdoc\PhpdocIndentFixer: {}
+    PhpCsFixer\Fixer\Phpdoc\PhpdocInlineTagFixer: {}
+    PhpCsFixer\Fixer\Phpdoc\PhpdocNoAccessFixer: {}
+    PhpCsFixer\Fixer\Phpdoc\PhpdocNoAliasTagFixer: {}
+    PhpCsFixer\Fixer\Phpdoc\PhpdocNoEmptyReturnFixer: {}
+    PhpCsFixer\Fixer\Phpdoc\PhpdocNoPackageFixer: {}
+    PhpCsFixer\Fixer\Phpdoc\PhpdocNoUselessInheritdocFixer: {}
+    PhpCsFixer\Fixer\Phpdoc\PhpdocReturnSelfReferenceFixer: {}
+    PhpCsFixer\Fixer\Phpdoc\PhpdocScalarFixer: {}
+    PhpCsFixer\Fixer\Phpdoc\PhpdocSeparationFixer: {}
+    PhpCsFixer\Fixer\Phpdoc\PhpdocSingleLineVarSpacingFixer: {}
+    PhpCsFixer\Fixer\Phpdoc\PhpdocTrimFixer: {}
+    PhpCsFixer\Fixer\Phpdoc\PhpdocTypesFixer: {}
+    PhpCsFixer\Fixer\Phpdoc\PhpdocTypesOrderFixer:
+        null_adjustment: always_last
+        sort_algorithm: none
+    PhpCsFixer\Fixer\Phpdoc\PhpdocVarWithoutNameFixer: {}
+    PhpCsFixer\Fixer\PhpTag\BlankLineAfterOpeningTagFixer: {}
+    PhpCsFixer\Fixer\PhpTag\FullOpeningTagFixer: {}
+    PhpCsFixer\Fixer\PhpTag\NoClosingTagFixer: {}
+    PhpCsFixer\Fixer\PhpUnit\PhpUnitDedicateAssertFixer: {}
+    PhpCsFixer\Fixer\PhpUnit\PhpUnitFqcnAnnotationFixer: {}
+    PhpCsFixer\Fixer\Semicolon\NoEmptyStatementFixer: {}
+    PhpCsFixer\Fixer\Semicolon\NoSinglelineWhitespaceBeforeSemicolonsFixer: {}
+    PhpCsFixer\Fixer\Semicolon\SpaceAfterSemicolonFixer: {}
+    PhpCsFixer\Fixer\Strict\DeclareStrictTypesFixer: {}
+    PhpCsFixer\Fixer\StringNotation\SingleQuoteFixer: {}
+    PhpCsFixer\Fixer\Whitespace\BlankLineBeforeStatementFixer: {}
+    PhpCsFixer\Fixer\Whitespace\IndentationTypeFixer: {}
+    PhpCsFixer\Fixer\Whitespace\LineEndingFixer: {}
+    PhpCsFixer\Fixer\Whitespace\NoExtraConsecutiveBlankLinesFixer:
+        - break
+        - case
+        - continue
+        - curly_brace_block
+        - default
+        - extra
+        - parenthesis_brace_block
+        - return
+        - square_brace_block
+        - switch
+        - throw
+        - use
+    PhpCsFixer\Fixer\Whitespace\NoSpacesAroundOffsetFixer: {}
+    PhpCsFixer\Fixer\Whitespace\NoSpacesInsideParenthesisFixer: {}
+    PhpCsFixer\Fixer\Whitespace\NoTrailingWhitespaceFixer: {}
+    PhpCsFixer\Fixer\Whitespace\NoWhitespaceInBlankLineFixer: {}
+    PhpCsFixer\Fixer\Whitespace\SingleBlankLineAtEofFixer: {}
+
+parameters:
+    skip:
+        PhpCsFixer\Fixer\ClassNotation\VisibilityRequiredFixer:
+            - *Spec.php
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -12,7 +12,7 @@
     </testsuites>
 
     <php>
-        <server name="KERNEL_DIR" value="tests/Application/app" />
+        <server name="KERNEL_CLASS_PATH" value="tests/Application/app/AppKernel.php" />
         <server name="IS_DOCTRINE_ORM_SUPPORTED" value="true" />
     </php>
 </phpunit>
diff --git a/spec/Document/AttributeDocumentSpec.php b/spec/Document/AttributeDocumentSpec.php
@@ -1,11 +1,9 @@
 <?php
 
-declare(strict_types=1);
-
 namespace spec\Sylius\ElasticSearchPlugin\Document;
 
-use PhpSpec\ObjectBehavior;
 use Sylius\ElasticSearchPlugin\Document\AttributeDocument;
+use PhpSpec\ObjectBehavior;
 
 final class AttributeDocumentSpec extends ObjectBehavior
 {

diff --git a/spec/Document/ImageDocumentSpec.php b/spec/Document/ImageDocumentSpec.php
@@ -1,11 +1,9 @@
 <?php
 
-declare(strict_types=1);
-
 namespace spec\Sylius\ElasticSearchPlugin\Document;
 
-use PhpSpec\ObjectBehavior;
 use Sylius\ElasticSearchPlugin\Document\ImageDocument;
+use PhpSpec\ObjectBehavior;
 
 final class ImageDocumentSpec extends ObjectBehavior
 {

diff --git a/spec/Document/PriceDocumentSpec.php b/spec/Document/PriceDocumentSpec.php
@@ -1,11 +1,9 @@
 <?php
 
-declare(strict_types=1);
-
 namespace spec\Sylius\ElasticSearchPlugin\Document;
 
-use PhpSpec\ObjectBehavior;
 use Sylius\ElasticSearchPlugin\Document\PriceDocument;
+use PhpSpec\ObjectBehavior;
 
 final class PriceDocumentSpec extends ObjectBehavior
 {

diff --git a/spec/Document/ProductDocumentSpec.php b/spec/Document/ProductDocumentSpec.php
@@ -1,13 +1,11 @@
 <?php
 
-declare(strict_types=1);
-
 namespace spec\Sylius\ElasticSearchPlugin\Document;
 
 use ONGR\ElasticsearchBundle\Collection\Collection;
-use PhpSpec\ObjectBehavior;
 use Sylius\ElasticSearchPlugin\Document\PriceDocument;
 use Sylius\ElasticSearchPlugin\Document\ProductDocument;
+use PhpSpec\ObjectBehavior;
 use Sylius\ElasticSearchPlugin\Document\TaxonDocument;
 
 final class ProductDocumentSpec extends ObjectBehavior
@@ -71,9 +69,9 @@ function it_has_main_taxon()
     function it_has_taxons()
     {
         $taxons = new Collection();
-        $this->setTaxons($taxons);
+        $this->setProductTaxons($taxons);
 
-        $this->getTaxons()->shouldReturn($taxons);
+        $this->getProductTaxons()->shouldReturn($taxons);
     }
 
     function it_has_attributes()

diff --git a/spec/Document/TaxonDocumentSpec.php b/spec/Document/TaxonDocumentSpec.php
@@ -1,12 +1,10 @@
 <?php
 
-declare(strict_types=1);
-
 namespace spec\Sylius\ElasticSearchPlugin\Document;
 
 use ONGR\ElasticsearchBundle\Collection\Collection;
-use PhpSpec\ObjectBehavior;
 use Sylius\ElasticSearchPlugin\Document\TaxonDocument;
+use PhpSpec\ObjectBehavior;
 
 final class TaxonDocumentSpec extends ObjectBehavior
 {