Fix phpstan level 4 on master

sonata-project · Aug 10, 2020 · ece51a9 · ece51a9
1 parent 3a4c36a
commit ece51a9
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 15 deletions.
diff --git a/src/Action/RetrieveAutocompleteItemsAction.php b/src/Action/RetrieveAutocompleteItemsAction.php
@@ -184,12 +184,12 @@ private function retrieveFilterFieldDescription(
         AdminInterface $admin,
         string $field
     ): FieldDescriptionInterface {
-        $fieldDescription = $admin->getFilterFieldDescription($field);
-
-        if (!$fieldDescription) {
+        if (!$admin->hasFilterFieldDescription($field)) {
             throw new \RuntimeException(sprintf('The field "%s" does not exist.', $field));
         }
 
+        $fieldDescription = $admin->getFilterFieldDescription($field);
+
         if (null === $fieldDescription->getTargetModel()) {
             throw new \RuntimeException(sprintf('No associated entity with field "%s".', $field));
         }
@@ -206,12 +206,12 @@ private function retrieveFormFieldDescription(
         AdminInterface $admin,
         string $field
     ): FieldDescriptionInterface {
-        $fieldDescription = $admin->getFormFieldDescription($field);
-
-        if (!$fieldDescription) {
+        if (!$admin->hasFormFieldDescription($field)) {
             throw new \RuntimeException(sprintf('The field "%s" does not exist.', $field));
         }
 
+        $fieldDescription = $admin->getFormFieldDescription($field);
+
         if (null === $fieldDescription->getTargetModel()) {
             throw new \RuntimeException(sprintf('No associated entity with field "%s".', $field));
         }

diff --git a/src/Action/SetObjectFieldValueAction.php b/src/Action/SetObjectFieldValueAction.php
@@ -86,16 +86,16 @@ public function __invoke(Request $request): JsonResponse
             return new JsonResponse('Invalid permissions', Response::HTTP_FORBIDDEN);
         }
 
-        if ('list' === $context) {
-            $fieldDescription = $admin->getListFieldDescription($field);
-        } else {
+        if ('list' !== $context) {
             return new JsonResponse('Invalid context', Response::HTTP_BAD_REQUEST);
         }
 
-        if (!$fieldDescription) {
+        if (!$admin->hasListFieldDescription($field)) {
             return new JsonResponse('The field does not exist', Response::HTTP_BAD_REQUEST);
         }
 
+        $fieldDescription = $admin->getListFieldDescription($field);
+
         if (!$fieldDescription->getOption('editable')) {
             return new JsonResponse('The field cannot be edited, editable option must be set to true', Response::HTTP_BAD_REQUEST);
         }

diff --git a/src/Admin/AbstractAdmin.php b/src/Admin/AbstractAdmin.php
@@ -1013,15 +1013,17 @@ public function isCurrentRoute(string $name, ?string $adminCode = null): bool
         $route = $request->get('_route');
 
         if ($adminCode) {
-            $admin = $this->getConfigurationPool()->getAdminByAdminCode($adminCode);
+            $pool = $this->getConfigurationPool();
+
+            if ($pool->hasAdminByAdminCode($adminCode)) {
+                $admin = $pool->getAdminByAdminCode($adminCode);
+            } else {
+                return false;
+            }
         } else {
             $admin = $this;
         }
 
-        if (!$admin) {
-            return false;
-        }
-
         return sprintf('%s_%s', $admin->getBaseRouteName(), $name) === $route;
     }
 

diff --git a/tests/Action/RetrieveAutocompleteItemsActionTest.php b/tests/Action/RetrieveAutocompleteItemsActionTest.php
@@ -92,6 +92,7 @@ public function testRetrieveAutocompleteItemsActionDisabledFormelememt(): void
         $this->admin->setSubject($object)->shouldBeCalled();
         $this->admin->hasAccess('create')->willReturn(true);
         $this->admin->getFormFieldDescriptions()->willReturn([]);
+        $this->admin->hasFormFieldDescription('barField')->willReturn(true);
         $this->admin->getFormFieldDescription('barField')->willReturn($fieldDescription->reveal());
 
         $fieldDescription->getTargetModel()->willReturn(Foo::class);
@@ -117,6 +118,7 @@ public function testRetrieveAutocompleteItemsTooShortSearchString(): void
         $this->admin->getNewInstance()->willReturn($object);
         $this->admin->setSubject($object)->shouldBeCalled();
         $this->admin->hasAccess('create')->willReturn(true);
+        $this->admin->hasFormFieldDescription('barField')->willReturn(true);
         $this->admin->getFormFieldDescription('barField')->willReturn($fieldDescription->reveal());
         $this->admin->getFormFieldDescriptions()->willReturn([]);
         $targetAdmin->checkAccess('list')->shouldBeCalled();
@@ -226,6 +228,7 @@ private function configureAutocompleteItemsDatagrid(): ObjectProphecy
         $this->admin->getNewInstance()->willReturn($model);
         $this->admin->setSubject($model)->shouldBeCalled();
         $this->admin->hasAccess('create')->willReturn(true);
+        $this->admin->hasFormFieldDescription('barField')->willReturn(true);
         $this->admin->getFormFieldDescription('barField')->willReturn($fieldDescription->reveal());
         $this->admin->getFormFieldDescriptions()->willReturn([]);
         $this->admin->id($model)->willReturn(123);

diff --git a/tests/Action/SetObjectFieldValueActionTest.php b/tests/Action/SetObjectFieldValueActionTest.php
@@ -100,6 +100,7 @@ public function testSetObjectFieldValueAction(): void
         $this->admin->getObject(42)->willReturn($object);
         $this->admin->getCode()->willReturn('sonata.post.admin');
         $this->admin->hasAccess('edit', $object)->willReturn(true);
+        $this->admin->hasListFieldDescription('enabled')->willReturn(true);
         $this->admin->getListFieldDescription('enabled')->willReturn($fieldDescription->reveal());
         $this->admin->update($object)->shouldBeCalled();
         $templateRegistry->getTemplate('base_list_field')->willReturn('admin_template');
@@ -162,6 +163,7 @@ public function testSetObjectFieldValueActionWithDate($timezone, \DateTimeZone $
         $this->admin->getObject(42)->willReturn($object);
         $this->admin->getCode()->willReturn('sonata.post.admin');
         $this->admin->hasAccess('edit', $object)->willReturn(true);
+        $this->admin->hasListFieldDescription('dateProp')->willReturn(true);
         $this->admin->getListFieldDescription('dateProp')->willReturn($fieldDescription->reveal());
         $this->admin->update($object)->shouldBeCalled();
 
@@ -217,6 +219,7 @@ public function testSetObjectFieldValueActionOnARelationField(): void
         $this->admin->getObject(42)->willReturn($object);
         $this->admin->getCode()->willReturn('sonata.post.admin');
         $this->admin->hasAccess('edit', $object)->willReturn(true);
+        $this->admin->hasListFieldDescription('bar')->willReturn(true);
         $this->admin->getListFieldDescription('bar')->willReturn($fieldDescription->reveal());
         $this->admin->getClass()->willReturn(\get_class($object));
         $this->admin->update($object)->shouldBeCalled();
@@ -264,6 +267,7 @@ public function testSetObjectFieldValueActionWithViolations(): void
         $this->pool->getPropertyAccessor()->willReturn($propertyAccessor);
         $this->admin->getObject(42)->willReturn($object);
         $this->admin->hasAccess('edit', $object)->willReturn(true);
+        $this->admin->hasListFieldDescription('bar.enabled')->willReturn(true);
         $this->admin->getListFieldDescription('bar.enabled')->willReturn($fieldDescription->reveal());
         $this->validator->validate($bar)->willReturn(new ConstraintViolationList([
             new ConstraintViolation('error1', null, [], null, 'enabled', null),
@@ -300,6 +304,7 @@ public function testSetObjectFieldEditableMultipleValue(): void
         $this->admin->getObject(42)->willReturn($object);
         $this->admin->getCode()->willReturn('sonata.post.admin');
         $this->admin->hasAccess('edit', $object)->willReturn(true);
+        $this->admin->hasListFieldDescription('status')->willReturn(true);
         $this->admin->getListFieldDescription('status')->willReturn($fieldDescription->reveal());
         $this->admin->update($object)->shouldBeCalled();
         $templateRegistry->getTemplate('base_list_field')->willReturn('admin_template');