Cleanup

[airbundle] / Entity / Application.php

diff --git a/Entity/Application.php b/Entity/Application.php
index 48e69929edb8fd4d2163638124f73b2cfc859bbe..b2672a19aa898ff58a383fed4bb273c27fe7e957 100644 (file)
--- a/Entity/Application.php
+++ b/Entity/Application.php
@@ -1,11 +1,11 @@
 <?php declare(strict_types=1);
 
 /*
 <?php declare(strict_types=1);
 
 /*

- * this file is part of the rapsys packbundle package.
+ * This file is part of the Rapsys AirBundle package.

  *
  *

- * (c) raphaël gertz <symfony@rapsys.eu>
+ * (c) Raphaël Gertz <symfony@rapsys.eu>

  *
  *

- * for the full copyright and license information, please view the license
+ * For the full copyright and license information, please view the LICENSE

  * file that was distributed with this source code.
  */
 
  * file that was distributed with this source code.
  */
 


@@ -18,51 +18,52 @@ use Doctrine\ORM\Event\PreUpdateEventArgs;
  */
 class Application {
        /**
  */
 class Application {
        /**

-        * @var integer
+        * Primary key

         */
         */

-       private $id;
+       private ?int $id = null;

 
        /**
 
        /**

-        * @var Dance
+        * Dance instance

         */
         */

-       private $dance;
+       private Dance $dance;

 
        /**
 
        /**

-        * @var float
+        * Score

         */
         */

-       private $score;
+       private ?float $score = null;

 
        /**
 
        /**

-        * @var \DateTime
+        * Cancel datetime

         */
         */

-       private $canceled;
+       private ?\DateTime $canceled = null;

 
        /**
 
        /**

-        * @var \DateTime
+        * Create datetime

         */
         */

-       private $created;
+       private \DateTime $created;

 
        /**
 
        /**

-        * @var \DateTime
+        * Update datetime

         */
         */

-       private $updated;
+       private \DateTime $updated;

 
        /**
 
        /**

-        * @var \Rapsys\AirBundle\Entity\Session
+        * Session instance

         */
         */

-       private $session;
+       private $session = null;

 
        /**
 
        /**

-        * @var \Rapsys\AirBundle\Entity\User
+        * User instance

         */
         */

-       private $user;
+       private $user = null;

 
        /**
         * Constructor
         */
        public function __construct() {
 
        /**
         * Constructor
         */
        public function __construct() {

-               $this->session = null;
-               $this->user = null;
+               //Set defaults
+               $this->created = new \DateTime('now');
+               $this->updated = new \DateTime('now');

        }
 
        /**
        }
 
        /**


@@ -70,7 +71,7 @@ class Application {
         *
         * @return integer
         */
         *
         * @return integer
         */

-       public function getId(): int {
+       public function getId(): ?int {

                return $this->id;
        }
 
                return $this->id;
        }
 


@@ -79,9 +80,9 @@ class Application {
         *
         * @param Dance $dance
         *
         *
         * @param Dance $dance
         *

-        * @return Session
+        * @return Application

         */
         */

-       public function setDance(Dance $dance): Session {
+       public function setDance(Dance $dance): Application {

                $this->dance = $dance;
 
                return $this;
                $this->dance = $dance;
 
                return $this;


@@ -233,7 +234,7 @@ class Application {
         */
        public function preUpdate(PreUpdateEventArgs $eventArgs) {
                //Check that we have an application instance
         */
        public function preUpdate(PreUpdateEventArgs $eventArgs) {
                //Check that we have an application instance

-               if (($application = $eventArgs->getEntity()) instanceof Application) {
+               if (($application = $eventArgs->getObject()) instanceof Application) {

                        //Set updated value
                        $application->setUpdated(new \DateTime('now'));
                }
                        //Set updated value
                        $application->setUpdated(new \DateTime('now'));
                }