Skip to content

Commit

Permalink
[Task] Apply native parameter and return type hints according to php …
Browse files Browse the repository at this point in the history
…docs (#13474)

* [Task]: Apply native parameter and return type hints according to php docs

* [Task]: Apply native parameter and return type hints according to php docs

* [Task]: Apply native parameter and return type hints according to php docs

* [Task]: Apply native parameter and return type hints according to php docs

* [Task]: Apply native parameter and return type hints according to php docs

* [Task]: Apply native parameter and return type hints according to php docs

* [Task]: Apply native parameter and return type hints according to php docs

* [Task]: Apply native parameter and return type hints according to php docs

* [Task]: Apply native parameter and return type hints according to php docs

* [Task]: Apply native parameter and return type hints according to php docs

* [Task]: Apply native parameter and return type hints according to php docs

* [Task]: Apply native parameter and return type hints according to php docs

* [Task]: Apply native parameter and return type hints according to php docs

* [Task]: Apply native parameter and return type hints according to php docs

* [Task]: Apply native parameter and return type hints according to php docs

* [Task]: Apply native parameter and return type hints according to php docs

* [Task]: Apply native parameter and return type hints according to php docs

* [Task]: Apply native parameter and return type hints according to php docs

* [Task]: Apply native parameter and return type hints according to php docs

* [Task]: Apply native parameter and return type hints according to php docs

* [Task]: Apply native parameter and return type hints according to php docs

* [Task]: Apply native parameter and return type hints according to php docs
Removed strict-types from dao

* [Task]: Apply native parameter and return type hints - Cache tests

* [Task]: Apply native parameter and return type hints - register calculator service independent of Model

* [Task]: Apply native parameter and return type hints - fix ecommerce class sources

* [Task]: Apply native parameter and return type hints - fix ecommerce classes

* [Task]: Apply native parameter and return type hints - fix ecommerce tests

* [Task]: Apply native parameter and return type hints - fix unit tests

* [Task]: Apply native parameter and return type hints according to php docs

* [Task]: Apply native parameter and return type hints according to php docs

* [Task]: Apply native parameter and return type hints - revert this phpdocs

* [Task]: Apply native parameter and return type hints according to php docs
Fixed model tests

* [Task]: Apply native parameter and return type hints according to php docs
Fixed model tests

* [Task]: Apply native parameter and return type hints according to php docs
Fix phpstan + tests

* [Task]: Apply native parameter and return type hints according to php docs
Reviewer Feedback

* [Task]: Apply native parameter and return type hints according to php docs
Reviewer feedback

* [Task]: Apply native parameter and return type hints - make EcommerceFrameworkBundle\Environment::$useGuestCart nullable

* [Task]: Apply native parameter and return type hints according to php docs
Upgraded doctrine-bridge to fix test problems

* [Task]: Apply native parameter and return type hints according to php docs
Reviewer feedback

* [Task]: Apply native parameter and return type hints according to phpdocs

* [Task]: Apply native parameter and return type hints - fix stan

* [Task]: Apply native parameter and return type hints according to php docs
Fix for failing tests

* bumping deep-copy

* fix imagick get color call

* improve test error reporting

* ignore phpstan error

* [Task]: Apply native parameter and return type hints according to php docs
Added upgrade notes

Co-authored-by: Divesh Pahuja <divesh.pahuja@pimcore.com>
Co-authored-by: Christian Fasching <christian.fasching@pimcore.com>
  • Loading branch information
3 people committed Nov 21, 2022
1 parent 651905c commit 83142b5
Show file tree
Hide file tree
Showing 1,935 changed files with 16,636 additions and 40,391 deletions.
1 change: 1 addition & 0 deletions .github/ci/files/config/bundles.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php
declare(strict_types=1);

return [
"Pimcore\\Bundle\\EcommerceFrameworkBundle\\PimcoreEcommerceFrameworkBundle" => [
Expand Down
1 change: 0 additions & 1 deletion .github/ci/files/config/dao-classmap.php
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@
<?php
2 changes: 2 additions & 0 deletions .github/ci/files/public/index_test.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?php
declare(strict_types=1);

/**
* Pimcore
*
Expand Down
1 change: 1 addition & 0 deletions .github/ci/files/src/Kernel.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php
declare(strict_types=1);

/**
* Pimcore
Expand Down
5 changes: 1 addition & 4 deletions .github/ci/files/var/classes/DataObject/Customer.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php
declare(strict_types=1);

/**
* Inheritance: yes
Expand All @@ -21,10 +22,6 @@ class Customer extends Concrete
protected $o_classId = "CU";
protected $o_className = "Customer";

/**
* @param array $values
* @return static
*/
public static function create(array $values = []): static
{
$object = new static();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php
declare(strict_types=1);

/**
* Fields Summary:
Expand All @@ -14,16 +15,17 @@

use Pimcore\Model\DataObject;
use Pimcore\Model\DataObject\PreGetValueHookInterface;
use Pimcore\Model\Element\AbstractElement;

class FilterCategory extends \Pimcore\Bundle\EcommerceFrameworkBundle\Model\CategoryFilterDefinitionType
{
protected $type = "FilterCategory";
protected $label;
protected $preSelect;
protected $rootCategory;
protected $includeParentCategories;
protected $scriptPath;
protected $availableCategories;
protected string $type = "FilterCategory";
protected ?string $label;
protected \Pimcore\Model\Element\AbstractElement|null|DataObject\Category $preSelect;
protected \Pimcore\Model\Element\AbstractElement|null|DataObject\Category $rootCategory;
protected ?bool $includeParentCategories;
protected ?string $scriptPath;
protected array $availableCategories;


/**
Expand Down Expand Up @@ -54,9 +56,9 @@ public function setLabel(?string $label): static

/**
* Get preSelect - Pre Select
* @return \Pimcore\Model\DataObject\Category|null
* @return DataObject\Category|\Pimcore\Model\Element\AbstractElement|\Pimcore\Model\Element\ElementInterface|null
*/
public function getPreSelect(): ?\Pimcore\Model\Element\AbstractElement
public function getPreSelect(): DataObject\Category|\Pimcore\Model\Element\ElementInterface|\Pimcore\Model\Element\AbstractElement|null
{
$container = $this;
/** @var \Pimcore\Model\DataObject\ClassDefinition\Data\ManyToOneRelation $fd */
Expand Down Expand Up @@ -92,9 +94,9 @@ public function setPreSelect(?\Pimcore\Model\Element\AbstractElement $preSelect)

/**
* Get rootCategory - Root Category
* @return \Pimcore\Model\DataObject\Category|null
* @return DataObject\Category|\Pimcore\Model\Element\AbstractElement|\Pimcore\Model\Element\ElementInterface|null
*/
public function getRootCategory(): ?\Pimcore\Model\Element\AbstractElement
public function getRootCategory(): DataObject\Category|\Pimcore\Model\Element\ElementInterface|\Pimcore\Model\Element\AbstractElement|null
{
$container = $this;
/** @var \Pimcore\Model\DataObject\ClassDefinition\Data\ManyToOneRelation $fd */
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php
declare(strict_types=1);

/**
* Fields Summary:
Expand All @@ -17,13 +18,13 @@

class FilterCategoryMultiselect extends \Pimcore\Bundle\EcommerceFrameworkBundle\Model\CategoryFilterDefinitionType
{
protected $type = "FilterCategoryMultiselect";
protected $label;
protected $preSelect;
protected $useAndCondition;
protected $includeParentCategories;
protected $scriptPath;
protected $availableCategories;
protected string $type = "FilterCategoryMultiselect";
protected ?string $label;
protected array $preSelect;
protected ?bool $useAndCondition;
protected ?bool $includeParentCategories;
protected ?string $scriptPath;
protected array $availableCategories;


/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php
declare(strict_types=1);

/**
* Fields Summary:
Expand All @@ -15,11 +16,11 @@

class FilterInputfield extends \Pimcore\Bundle\EcommerceFrameworkBundle\Model\AbstractFilterDefinitionType
{
protected $type = "FilterInputfield";
protected $label;
protected $field;
protected $preSelect;
protected $scriptPath;
protected string $type = "FilterInputfield";
protected ?string $label;
protected ?\Pimcore\Bundle\EcommerceFrameworkBundle\CoreExtensions\ObjectData\IndexFieldSelection $field;
protected ?string $preSelect;
protected ?string $scriptPath;


/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php
declare(strict_types=1);

/**
* Fields Summary:
Expand All @@ -16,12 +17,12 @@

class FilterMultiRelation extends \Pimcore\Bundle\EcommerceFrameworkBundle\Model\AbstractFilterDefinitionType
{
protected $type = "FilterMultiRelation";
protected $label;
protected $field;
protected $useAndCondition;
protected $scriptPath;
protected $availableRelations;
protected string $type = "FilterMultiRelation";
protected ?string $label;
protected ?\Pimcore\Bundle\EcommerceFrameworkBundle\CoreExtensions\ObjectData\IndexFieldSelection $field;
protected ?bool $useAndCondition;
protected ?string $scriptPath;
protected array $availableRelations;


/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php
declare(strict_types=1);

/**
* Fields Summary:
Expand All @@ -15,11 +16,11 @@

class FilterMultiSelect extends \Pimcore\Bundle\EcommerceFrameworkBundle\Model\AbstractFilterDefinitionType
{
protected $type = "FilterMultiSelect";
protected $label;
protected $field;
protected $scriptPath;
protected $UseAndCondition;
protected string $type = "FilterMultiSelect";
protected ?string $label;
protected ?\Pimcore\Bundle\EcommerceFrameworkBundle\CoreExtensions\ObjectData\IndexFieldSelection $field;
protected ?string $scriptPath;
protected ?bool $UseAndCondition;


/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php
declare(strict_types=1);

/**
* Fields Summary:
Expand All @@ -15,11 +16,11 @@

class FilterMultiSelectFromMultiSelect extends \Pimcore\Bundle\EcommerceFrameworkBundle\Model\AbstractFilterDefinitionType
{
protected $type = "FilterMultiSelectFromMultiSelect";
protected $label;
protected $field;
protected $scriptPath;
protected $UseAndCondition;
protected string $type = "FilterMultiSelectFromMultiSelect";
protected ?string $label = null;
protected ?\Pimcore\Bundle\EcommerceFrameworkBundle\CoreExtensions\ObjectData\IndexFieldSelection $field;
protected ?string $scriptPath;
protected ?bool $UseAndCondition;


/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php
declare(strict_types=1);

/**
* Fields Summary:
Expand All @@ -18,14 +19,14 @@

class FilterNumberRange extends \Pimcore\Bundle\EcommerceFrameworkBundle\Model\AbstractFilterDefinitionType
{
protected $type = "FilterNumberRange";
protected $label;
protected $field;
protected $rangeFrom;
protected $rangeTo;
protected $preSelectFrom;
protected $preSelectTo;
protected $scriptPath;
protected string $type = "FilterNumberRange";
protected ?string $label;
protected ?\Pimcore\Bundle\EcommerceFrameworkBundle\CoreExtensions\ObjectData\IndexFieldSelection $field;
protected ?float $rangeFrom;
protected ?float $rangeTo;
protected ?float $preSelectFrom;
protected ?float $preSelectTo;
protected ?string $scriptPath;


/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php
declare(strict_types=1);

/**
* Fields Summary:
Expand All @@ -18,14 +19,14 @@

class FilterNumberRangeSelection extends \Pimcore\Bundle\EcommerceFrameworkBundle\Model\AbstractFilterDefinitionType
{
protected $type = "FilterNumberRangeSelection";
protected $label;
protected $field;
protected $ranges;
protected $preSelectFrom;
protected $preSelectTo;
protected $scriptPath;
protected $unit;
protected string $type = "FilterNumberRangeSelection";
protected ?string $label;
protected ?\Pimcore\Bundle\EcommerceFrameworkBundle\CoreExtensions\ObjectData\IndexFieldSelection $field;
protected ?DataObject\Data\StructuredTable $ranges;
protected ?float $preSelectFrom;
protected ?float $preSelectTo;
protected ?string $scriptPath;
protected ?string $unit;


/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php
declare(strict_types=1);

/**
* Fields Summary:
Expand All @@ -15,11 +16,11 @@

class FilterRelation extends \Pimcore\Bundle\EcommerceFrameworkBundle\Model\AbstractFilterDefinitionType
{
protected $type = "FilterRelation";
protected $label;
protected $field;
protected $scriptPath;
protected $availableRelations;
protected string $type = "FilterRelation";
protected ?string $label = null;
protected ?\Pimcore\Bundle\EcommerceFrameworkBundle\CoreExtensions\ObjectData\IndexFieldSelection $field = null;
protected ?string $scriptPath = null;
protected array $availableRelations;


/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php
declare(strict_types=1);

/**
* Fields Summary:
Expand All @@ -14,10 +15,10 @@

class FilterSelect extends \Pimcore\Bundle\EcommerceFrameworkBundle\Model\AbstractFilterDefinitionType
{
protected $type = "FilterSelect";
protected $label;
protected $field;
protected $scriptPath;
protected string $type = "FilterSelect";
protected ?string $label = null;
protected ?\Pimcore\Bundle\EcommerceFrameworkBundle\CoreExtensions\ObjectData\IndexFieldSelection $field = null;
protected ?string $scriptPath = null;


/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php
declare(strict_types=1);

/**
* Fields Summary:
Expand All @@ -14,10 +15,10 @@

class FilterSelectFromMultiSelect extends \Pimcore\Bundle\EcommerceFrameworkBundle\Model\AbstractFilterDefinitionType
{
protected $type = "FilterSelectFromMultiSelect";
protected $label;
protected $field;
protected $scriptPath;
protected string $type = "FilterSelectFromMultiSelect";
protected ?string $label;
protected ?\Pimcore\Bundle\EcommerceFrameworkBundle\CoreExtensions\ObjectData\IndexFieldSelection $field;
protected ?string $scriptPath;


/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php
declare(strict_types=1);

/**
* Fields Summary:
Expand All @@ -13,9 +14,9 @@

class OrderByFields extends DataObject\Fieldcollection\Data\AbstractData
{
protected $type = "OrderByFields";
protected $field;
protected $direction;
protected string $type = "OrderByFields";
protected ?string $field;
protected ?string $direction;


/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php
declare(strict_types=1);

/**
* Fields Summary:
Expand All @@ -15,11 +16,11 @@

class OrderPriceModifications extends DataObject\Fieldcollection\Data\AbstractData
{
protected $type = "OrderPriceModifications";
protected $name;
protected $netAmount;
protected $pricingRuleId;
protected $amount;
protected string $type = "OrderPriceModifications";
protected ?string $name;
protected ?string $netAmount;
protected ?int $pricingRuleId;
protected ?string $amount;


/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php
declare(strict_types=1);

/**
* Fields Summary:
Expand Down
Loading

0 comments on commit 83142b5

Please sign in to comment.