Remove id argument from Tweet::__construct()

alexislefebvre · alexislefebvre · commit 631b9fadec18 · 2018-11-17T22:56:44.000+01:00
diff --git a/src/Entity/Tweet.php b/src/Entity/Tweet.php
@@ -59,12 +59,8 @@ class Tweet
      */
     private $medias;
 
-    public function __construct($id = null)
+    public function __construct()
     {
-        if (!is_null($id)) {
-            $this->setId($id);
-        }
-
         $this->medias = new ArrayCollection();
         $this->retweeting_statuses = new ArrayCollection();
     }
diff --git a/src/Utils/PersistTweet.php b/src/Utils/PersistTweet.php
@@ -79,9 +79,10 @@ protected function addMedias(\stdClass $tweetTmp, Tweet $tweet)
      */
     protected function createTweet(\stdClass $tweetTmp, $user, $inTimeline)
     {
-        $tweet = new Tweet($tweetTmp->id);
+        $tweet = new Tweet();
 
         $tweet
+            ->setId($tweetTmp->id)
             ->setValues($tweetTmp)
             ->setUser($user)
             ->setInTimeline($inTimeline);
diff --git a/tests/DataFixtures/ORM/LoadTweetAndRetweetData.php b/tests/DataFixtures/ORM/LoadTweetAndRetweetData.php
@@ -14,8 +14,9 @@ class LoadTweetAndRetweetData extends AbstractFixture implements DependentFixtur
      */
     public function load(ObjectManager $manager)
     {
-        $tweet = new Tweet(10);
+        $tweet = new Tweet();
         $tweet
+            ->setId(10)
             ->setUser($this->getReference('user'))
             ->setCreatedAt(new \Datetime('2015-02-10 21:19:20'))
             ->setText('Hello Twitter! #myfirstTweet')
diff --git a/tests/DataFixtures/ORM/LoadTweetData.php b/tests/DataFixtures/ORM/LoadTweetData.php
@@ -14,8 +14,9 @@ class LoadTweetData extends AbstractFixture implements DependentFixtureInterface
      */
     public function load(ObjectManager $manager)
     {
-        $tweet = new Tweet(49664);
+        $tweet = new Tweet();
         $tweet
+            ->setId(49664)
             ->setUser($this->getReference('user'))
             ->setCreatedAt(new \Datetime('2015-02-10 21:19:20'))
             ->setText('Hello Twitter! #myfirstTweet')
diff --git a/tests/DataFixtures/ORM/LoadTweetPagesData.php b/tests/DataFixtures/ORM/LoadTweetPagesData.php
@@ -17,8 +17,9 @@ public function load(ObjectManager $manager)
         $tweetId = 1;
 
         // Add retweeted Tweet
-        $retweeted = new Tweet($tweetId);
+        $retweeted = new Tweet();
         $retweeted
+            ->setId($tweetId)
             ->setUser($this->getReference('user-githubeng'))
             ->setCreatedAt(new \Datetime(
                 '2015-02-10 21:18:'.sprintf('%02d', $tweetId)))
@@ -30,8 +31,9 @@ public function load(ObjectManager $manager)
 
         // not retweet tweets
         foreach (range(2, 40) as $tweetId) {
-            $tweet = new Tweet($tweetId);
+            $tweet = new Tweet();
             $tweet
+                ->setId($tweetId)
                 ->setUser($this->getReference('user'))
                 ->setCreatedAt(
                     new \Datetime('2015-02-10 21:19:'.sprintf('%02d', $tweetId)))
diff --git a/tests/Entity/TweetTest.php b/tests/Entity/TweetTest.php
@@ -21,8 +21,9 @@ public function testTweet()
             ->setExpandedUrl('http://twitter.com/AsyncTweets/status/567836201210900480/photo/1');
 
         // Tweet
-        $tweet = new Tweet(152120320);
+        $tweet = new Tweet();
         $tweet
+            ->setId(152120320)
             ->setCreatedAt($now)
             ->setText('Hello World!')
             ->setRetweetCount(1999)
diff --git a/tests/Features/Context/FeatureContext.php b/tests/Features/Context/FeatureContext.php
@@ -26,8 +26,9 @@ public function thereIsATweet()
     {
         $this->now = new \Datetime('now');
 
-        $this->tweet = new Tweet(152120320);
+        $this->tweet = new Tweet();
         $this->tweet
+            ->setId(152120320)
             ->setCreatedAt($this->now)
             ->setText('Hello World!')
             ->setRetweetCount(1999)

Original file line number	Diff line number	Diff line change
`@@ -59,12 +59,8 @@ class Tweet`
`59`	`59`	`*/`
`60`	`60`	`private $medias;`
`61`	`61`
`62`		`- public function __construct($id = null)`
	`62`	`+ public function __construct()`
`63`	`63`	`{`
`64`		`- if (!is_null($id)) {`
`65`		`- $this->setId($id);`
`66`		`- }`
`67`		`-`
`68`	`64`	`$this->medias = new ArrayCollection();`
`69`	`65`	`$this->retweeting_statuses = new ArrayCollection();`
`70`	`66`	`}`