Further fixes to make all unit tests passing with new PHP 8.1 version.

divix1988 · Jan 8, 2023 · 86cfd3c · 86cfd3c
1 parent ccbae46
commit 86cfd3c
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 27 deletions.
diff --git a/Chapter 21/module/Application/src/Controller/UsersController.php b/Chapter 21/module/Application/src/Controller/UsersController.php
@@ -51,13 +51,14 @@ public function addAction()
         $userForm->setData($request->getPost());
 
         if (!$userForm->isValid()) {
-            print_r($userForm->getMessages());
-            exit('not valid');
+            //this is not needed for Unit tests
+            //print_r($userForm->getMessages());
+            //exit('not valid');
             return ['userForm' => $userForm];
         }
         $userModel->exchangeArray($userForm->getData());
         $this->usersTable->save($userModel);
-        
+
         return $this->redirect()->toRoute('users');
     }
 

diff --git a/Chapter 21/module/Application/src/Form/UserForm.php b/Chapter 21/module/Application/src/Form/UserForm.php
@@ -35,28 +35,6 @@ public function __construct($name = 'user', array $params = [])
             'name' => 'user_info',
         ]);
 
-        $this->add([
-            'name' => 'apctha',
-            'type' => Element\Captcha::class,
-            'options' => [
-                'label' => 'Rewrite Captcha text:',
-                'captcha' => new \Laminas\Captcha\Image([
-                    'name' => 'myCaptcha',
-                    'messages' => array(
-                        'badCaptcha' => 'incorrectly rewritten image text'
-                    ),
-                    'wordLen' => 5,
-                    'timeout' => 100,
-                    'font' => APPLICATION_PATH.'/public/fonts/arbli.ttf',
-                    'imgDir' => APPLICATION_PATH.'/public/img/captcha/',
-                    'imgUrl' => $this->getOption('baseUrl').'/public/img/captcha/',
-                    'lineNoiseLevel' => 4,
-                    'width' => 200,
-                    'height' => 70
-                ]),
-            ]
-        ]);
-
         $this->add([
             'name' => 'submit',
             'type' => 'submit',

diff --git a/Chapter 21/module/Application/test/Controller/UsersControllerTest.php b/Chapter 21/module/Application/test/Controller/UsersControllerTest.php
@@ -15,6 +15,8 @@ class UsersControllerTest extends \Laminas\Test\PHPUnit\Controller\AbstractHttpC
     protected $traceError = true;
     protected $usersTable;
     protected $userHobbiesTable;
+
+    use \Prophecy\PhpUnit\ProphecyTrait;
 
     protected function setup():void
     {
@@ -100,7 +102,7 @@ public function testUpdateActionValidate()
 	$this->usersTable->getById($id)->willReturn($rowset);
 	$this->dispatch('/users/edit/'.$id, 'GET');
 	$this->assertResponseStatusCode(200);
-	$dom = new \Laminas\Dom\Query($this->getResponse());
+	$dom = new \Laminas\Dom\Query($this->getResponse()->getBody());
 	$results = $dom->execute('input[name="username"]');
 	$this->assertEquals($editData['username'], $results[0]->getAttribute('value'));
 	$this->assertQueryContentContains('.jumbotron .zf-green', 'Edit User id: '.$editData['id']);

diff --git a/Chapter 21/module/Application/test/Model/ComicsTableTest.php b/Chapter 21/module/Application/test/Model/ComicsTableTest.php
@@ -14,6 +14,8 @@ class ComicsTableTest extends \Laminas\Test\PHPUnit\Controller\AbstractHttpContr
     protected $traceError = true;
     protected $usersTable;
     protected $baseUrl;
+
+    use \Prophecy\PhpUnit\ProphecyTrait;
 
     protected function setup():void
     {

diff --git a/Chapter 21/phpunit.xml.dist b/Chapter 21/phpunit.xml.dist
@@ -11,7 +11,7 @@
         </whitelist>
     </filter>
     <php>
-        <const name="APPLICATION_PATH" value="E:\RZECZY_ADAMA\_XAMPP\xampp-7.4\htdocs\laminas_app\" />
+        <const name="APPLICATION_PATH" value="E:\RZECZY_ADAMA\_XAMPP\xampp-8.1\htdocs\laminas_app\" />
         <server name="APPLICATION_ENV" value="tests" />
     </php>
 </phpunit>