Fix creating entities

blazekv · blazekv · commit d914a76d48b3 · 2018-02-06T10:40:47.000+01:00
diff --git a/src/MailQ/Resources/CampaignResource.php b/src/MailQ/Resources/CampaignResource.php
@@ -11,29 +11,29 @@
 trait CampaignResource
 {
 
-    /**
-     *
-     * @return CampaignsEntity
-     */
-    public function getCampaigns()
-    {
-        $request = Request::get("{$this->getCompanyId()}/campaigns");
-        $response = $this->getConnector()->sendRequest($request);
-        $data = Json::decode($response->getContent());
-        $json = new stdClass();
-        $json->campaigns = $data;
-        return new CampaignsEntity($json);
-    }
+	/**
+	 *
+	 * @return CampaignsEntity
+	 */
+	public function getCampaigns()
+	{
+		$request = Request::get("{$this->getCompanyId()}/campaigns");
+		$response = $this->getConnector()->sendRequest($request);
+		$data = Json::decode($response->getContent());
+		$json = new stdClass();
+		$json->campaigns = $data;
+		return new CampaignsEntity($json, true);
+	}
 
-    /**
-     * @param $campaignId
-     * @return CampaignEntity
-     */
-    public function getCampaign($campaignId)
-    {
-        $request = Request::put("{$this->getCompanyId()}/campaigns/{$campaignId}");
-        $response = $this->getConnector()->sendRequest($request);
-        return new CampaignEntity($response->getContent());
-    }
+	/**
+	 * @param $campaignId
+	 * @return CampaignEntity
+	 */
+	public function getCampaign($campaignId)
+	{
+		$request = Request::put("{$this->getCompanyId()}/campaigns/{$campaignId}");
+		$response = $this->getConnector()->sendRequest($request);
+		return new CampaignEntity($response->getContent(), true);
+	}
 
 }
diff --git a/src/MailQ/Resources/CompanyResource.php b/src/MailQ/Resources/CompanyResource.php
@@ -17,7 +17,7 @@ public function getCompany()
 	{
 		$request = Request::get("{$this->getCompanyId()}");
 		$response = $this->getConnector()->sendRequest($request);
-		return new CompanyEntity($response->getContent());
+		return new CompanyEntity($response->getContent(), true);
 	}
 
 	/**
@@ -28,7 +28,7 @@ public function regenerateApiKey()
 	{
 		$request = Request::put("{$this->getCompanyId()}");
 		$response = $this->getConnector()->sendRequest($request);
-		$apiKeyEntity = new ApiKeyEntity($response->getContent());
+		$apiKeyEntity = new ApiKeyEntity($response->getContent(), true);
 		return $apiKeyEntity->getApiKey();
 	}
 
diff --git a/src/MailQ/Resources/LogMessageResource.php b/src/MailQ/Resources/LogMessageResource.php
@@ -22,7 +22,7 @@ public function getLogMessages()
 		$data = Json::decode($response->getContent());
 		$json = new stdClass();
 		$json->messages = $data;
-		return new LogMessagesEntity($json);
+		return new LogMessagesEntity($json, true);
 	}
 
 
@@ -35,7 +35,7 @@ public function getLogMessage($logMessageId)
 	{
 		$request = Request::get("{$this->getCompanyId()}/log-messages/{$logMessageId}");
 		$response = $this->getConnector()->sendRequest($request);
-		return new LogMessageEntity($response->getContent());
+		return new LogMessageEntity($response->getContent(), true);
 	}
 
 }
diff --git a/src/MailQ/Resources/NewsletterResource.php b/src/MailQ/Resources/NewsletterResource.php
@@ -2,6 +2,8 @@
 
 namespace MailQ\Resources;
 
+use MailQ\Entities\v2\EmailAddressEntity;
+use MailQ\Entities\v2\NewsletterCommandEntity;
 use MailQ\Entities\v2\NewsletterEntity;
 use MailQ\Entities\v2\PreparedNewsletterEntity;
 use MailQ\Entities\v2\NewslettersEntity;
@@ -19,7 +21,7 @@ trait NewsletterResource
 	public function startNewsletter($newsletterId)
 	{
 		$request = Request::put("{$this->getCompanyId()}/newsletters/{$newsletterId}/preparation");
-		$command = new \MailQ\Entities\v2\NewsletterCommandEntity();
+		$command = new NewsletterCommandEntity();
 		$command->setStart(true);
 		$request->setContentAsEntity($command);
 		$this->getConnector()->sendRequest($request);
@@ -32,7 +34,7 @@ public function startNewsletter($newsletterId)
 	public function stopNewsletter($newsletterId)
 	{
 		$request = Request::put("{$this->getCompanyId()}/newsletters/{$newsletterId}/preparation");
-		$command = new \MailQ\Entities\v2\NewsletterCommandEntity();
+		$command = new NewsletterCommandEntity();
 		$command->setStop(true);
 		$request->setContentAsEntity($command);
 		$this->getConnector()->sendRequest($request);
@@ -45,7 +47,7 @@ public function stopNewsletter($newsletterId)
 	public function sendTestEmail($email, $newsletterId)
 	{
 		$request = Request::post("{$this->getCompanyId()}/newsletters/{$newsletterId}/test-email");
-		$emailAddress = new \MailQ\Entities\v2\EmailAddressEntity();
+		$emailAddress = new EmailAddressEntity();
 		$emailAddress->setEmail($email);
 		$request->setContentAsEntity($emailAddress);
 		$this->getConnector()->sendRequest($request);
@@ -75,16 +77,16 @@ public function updateNewsletter(NewsletterEntity $newsletter)
 		$this->getConnector()->sendRequest($request);
 	}
 
-    /**
-     * Allows to update newsletter in ready state without returning to test state
-     * @param PreparedNewsletterEntity $newsletter
-     */
-    public function updatePreparedNewsletter(PreparedNewsletterEntity $newsletter)
-    {
-        $request = Request::patch("{$this->getCompanyId()}/newsletters/{$newsletter->getId()}");
-        $request->setContentAsEntity($newsletter);
-        $this->getConnector()->sendRequest($request);
-    }
+	/**
+	 * Allows to update newsletter in ready state without returning to test state
+	 * @param PreparedNewsletterEntity $newsletter
+	 */
+	public function updatePreparedNewsletter(PreparedNewsletterEntity $newsletter)
+	{
+		$request = Request::patch("{$this->getCompanyId()}/newsletters/{$newsletter->getId()}");
+		$request->setContentAsEntity($newsletter);
+		$this->getConnector()->sendRequest($request);
+	}
 
 	/**
 	 *
@@ -97,7 +99,7 @@ public function getNewsletters()
 		$data = Json::decode($response->getContent());
 		$json = new stdClass();
 		$json->newsletters = $data;
-		return new NewslettersEntity($json);
+		return new NewslettersEntity($json, true);
 	}
 
 	/**
@@ -109,7 +111,7 @@ public function getNewsletter($newsletterId)
 	{
 		$request = Request::get("{$this->getCompanyId()}/newsletters/{$newsletterId}");
 		$response = $this->getConnector()->sendRequest($request);
-		return new NewsletterEntity($response->getContent());
+		return new NewsletterEntity($response->getContent(), true);
 	}
 
 	/**
diff --git a/src/MailQ/Resources/NotificationResource.php b/src/MailQ/Resources/NotificationResource.php
@@ -73,7 +73,7 @@ public function getNotificationData($notificationId, $notificationDataId)
 	{
 		$request = Request::get("{$this->getCompanyId()}/notifications/{$notificationId}/data/{$notificationDataId}");
 		$response = $this->getConnector()->sendRequest($request);
-		return new NotificationDataEntity($response->getContent());
+		return new NotificationDataEntity($response->getContent(), true);
 	}
 
 	/**
diff --git a/src/MailQ/Resources/RecipientListResource.php b/src/MailQ/Resources/RecipientListResource.php
@@ -60,7 +60,7 @@ public function getRecipientListUnsubscribers($recipientsListId)
 	{
 		$request = Request::get("{$this->getCompanyId()}/recipients-lists/{$recipientsListId}/unsubscribers");
 		$response = $this->getConnector()->sendRequest($request);
-		return UnsubscribersEntity($response->getContent());
+		return new UnsubscribersEntity($response->getContent(), true);
 	}
 
 	/**
@@ -109,7 +109,7 @@ public function getRecipientListUnsubscriber($email, $recipientsListId)
 	{
 		$request = Request::put("{$this->getCompanyId()}/recipients-lists/{$recipientsListId}/unsubscribers/{$email}");
 		$response = $this->getConnector()->sendRequest($request);
-		return new UnsubscriberEntity($response->getContent());
+		return new UnsubscriberEntity($response->getContent(), true);
 	}
 
 	/**
@@ -126,7 +126,7 @@ public function deleteRecipient($email, $recipientsListId)
 	/**
 	 *
 	 * @param int $recipientsListId
-	 * @return RecipientEntity
+	 * @return RecipientsEntity
 	 */
 	public function getRecipients($recipientsListId)
 	{
@@ -135,7 +135,7 @@ public function getRecipients($recipientsListId)
 		$data = Json::decode($response->getContent());
 		$json = new stdClass();
 		$json->recipients = $data;
-		return new RecipientsEntity($json);
+		return new RecipientsEntity($json, true);
 	}
 
 	/**
@@ -180,7 +180,7 @@ public function getRecipientsLists($email = null)
 		$data = Json::decode($response->getContent());
 		$json = new stdClass();
 		$json->recipientsLists = $data;
-		return new RecipientsListsEntity($json);
+		return new RecipientsListsEntity($json, true);
 	}
 
 
@@ -193,7 +193,7 @@ public function getRecipientsList($recipientsListId)
 	{
 		$request = Request::get("{$this->getCompanyId()}/recipients-lists/{$recipientsListId}");
 		$response = $this->getConnector()->sendRequest($request);
-		return new RecipientsListEntity($response->getContent());
+		return new RecipientsListEntity($response->getContent(), true);
 	}
 
 }
diff --git a/src/MailQ/Resources/SenderEmailResource.php b/src/MailQ/Resources/SenderEmailResource.php
@@ -22,7 +22,7 @@ public function getSenderEmails()
 		$data = Json::decode($response->getContent());
 		$json = new stdClass();
 		$json->emails = $data;
-		return new SenderEmailsEntity($json);
+		return new SenderEmailsEntity($json, true);
 	}
 
 
@@ -34,7 +34,7 @@ public function getSenderEmail($senderEmailId)
 	{
 		$request = Request::get("{$this->getCompanyId()}/sender-emails/{$senderEmailId}");
 		$response = $this->getConnector()->sendRequest($request);
-		return new SenderEmailEntity($response->getContent());
+		return new SenderEmailEntity($response->getContent(), true);
 	}
 
 }
diff --git a/src/MailQ/Resources/SmsNotificationResource.php b/src/MailQ/Resources/SmsNotificationResource.php
@@ -41,15 +41,15 @@ public function sendSmsBatch(SmsBatchEntity $batch, $smsNotificationId)
 		$request = Request::post("{$this->getCompanyId()}/sms-notifications/{$smsNotificationId}/batch/data");
 		$request->setContentAsEntity($batch);
 		$this->getConnector()->sendRequest($request);
-		return new SmsBatchResultEntity($request->getContent());
+		return new SmsBatchResultEntity($request->getContent(), true);
 	}
 
 
 	public function getSms($smsNotificationId, $smsId)
 	{
 		$request = Request::get("{$this->getCompanyId()}/sms-notifications/{$smsNotificationId}/data/{$smsId}");
 		$response = $this->getConnector()->sendRequest($request);
-		return new SmsEntity($response->getContent());
+		return new SmsEntity($response->getContent(), true);
 	}
 
 	/**
@@ -95,7 +95,7 @@ public function getSmsNotifications()
 		$data = Json::decode($response->getContent());
 		$json = new stdClass();
 		$json->smsNotifications = $data;
-		return new SmsNotificationsEntity($json);
+		return new SmsNotificationsEntity($json, true);
 	}
 
 
@@ -108,7 +108,7 @@ public function getSmsNotification($smsNotificationId)
 	{
 		$request = Request::get("{$this->getCompanyId()}/sms-notifications/{$smsNotificationId}");
 		$response = $this->getConnector()->sendRequest($request);
-		return new SmsNotificationEntity($response->getContent());
+		return new SmsNotificationEntity($response->getContent(), true);
 	}
 
 }
diff --git a/src/MailQ/Resources/UnsubscriberResource.php b/src/MailQ/Resources/UnsubscriberResource.php
diff --git a/src/MailQ/Resources/UserResource.php b/src/MailQ/Resources/UserResource.php

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public function getCompany()`
`17`	`17`	`{`
`18`	`18`	`$request = Request::get("{$this->getCompanyId()}");`
`19`	`19`	`$response = $this->getConnector()->sendRequest($request);`
`20`		`- return new CompanyEntity($response->getContent());`
	`20`	`+ return new CompanyEntity($response->getContent(), true);`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`/**`
`@@ -28,7 +28,7 @@ public function regenerateApiKey()`
`28`	`28`	`{`
`29`	`29`	`$request = Request::put("{$this->getCompanyId()}");`
`30`	`30`	`$response = $this->getConnector()->sendRequest($request);`
`31`		`- $apiKeyEntity = new ApiKeyEntity($response->getContent());`
	`31`	`+ $apiKeyEntity = new ApiKeyEntity($response->getContent(), true);`
`32`	`32`	`return $apiKeyEntity->getApiKey();`
`33`	`33`	`}`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public function getLogMessages()`
`22`	`22`	`$data = Json::decode($response->getContent());`
`23`	`23`	`$json = new stdClass();`
`24`	`24`	`$json->messages = $data;`
`25`		`- return new LogMessagesEntity($json);`
	`25`	`+ return new LogMessagesEntity($json, true);`
`26`	`26`	`}`
`27`	`27`
`28`	`28`
`@@ -35,7 +35,7 @@ public function getLogMessage($logMessageId)`
`35`	`35`	`{`
`36`	`36`	`$request = Request::get("{$this->getCompanyId()}/log-messages/{$logMessageId}");`
`37`	`37`	`$response = $this->getConnector()->sendRequest($request);`
`38`		`- return new LogMessageEntity($response->getContent());`
	`38`	`+ return new LogMessageEntity($response->getContent(), true);`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public function getNotificationData($notificationId, $notificationDataId)`
`73`	`73`	`{`
`74`	`74`	`$request = Request::get("{$this->getCompanyId()}/notifications/{$notificationId}/data/{$notificationDataId}");`
`75`	`75`	`$response = $this->getConnector()->sendRequest($request);`
`76`		`- return new NotificationDataEntity($response->getContent());`
	`76`	`+ return new NotificationDataEntity($response->getContent(), true);`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public function getRecipientListUnsubscribers($recipientsListId)`
`60`	`60`	`{`
`61`	`61`	`$request = Request::get("{$this->getCompanyId()}/recipients-lists/{$recipientsListId}/unsubscribers");`
`62`	`62`	`$response = $this->getConnector()->sendRequest($request);`
`63`		`- return UnsubscribersEntity($response->getContent());`
	`63`	`+ return new UnsubscribersEntity($response->getContent(), true);`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`/**`
`@@ -109,7 +109,7 @@ public function getRecipientListUnsubscriber($email, $recipientsListId)`
`109`	`109`	`{`
`110`	`110`	`$request = Request::put("{$this->getCompanyId()}/recipients-lists/{$recipientsListId}/unsubscribers/{$email}");`
`111`	`111`	`$response = $this->getConnector()->sendRequest($request);`
`112`		`- return new UnsubscriberEntity($response->getContent());`
	`112`	`+ return new UnsubscriberEntity($response->getContent(), true);`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`/**`
`@@ -126,7 +126,7 @@ public function deleteRecipient($email, $recipientsListId)`
`126`	`126`	`/**`
`127`	`127`	`*`
`128`	`128`	`* @param int $recipientsListId`
`129`		`- * @return RecipientEntity`
	`129`	`+ * @return RecipientsEntity`
`130`	`130`	`*/`
`131`	`131`	`public function getRecipients($recipientsListId)`
`132`	`132`	`{`
`@@ -135,7 +135,7 @@ public function getRecipients($recipientsListId)`
`135`	`135`	`$data = Json::decode($response->getContent());`
`136`	`136`	`$json = new stdClass();`
`137`	`137`	`$json->recipients = $data;`
`138`		`- return new RecipientsEntity($json);`
	`138`	`+ return new RecipientsEntity($json, true);`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`/**`
`@@ -180,7 +180,7 @@ public function getRecipientsLists($email = null)`
`180`	`180`	`$data = Json::decode($response->getContent());`
`181`	`181`	`$json = new stdClass();`
`182`	`182`	`$json->recipientsLists = $data;`
`183`		`- return new RecipientsListsEntity($json);`
	`183`	`+ return new RecipientsListsEntity($json, true);`
`184`	`184`	`}`
`185`	`185`
`186`	`186`
`@@ -193,7 +193,7 @@ public function getRecipientsList($recipientsListId)`
`193`	`193`	`{`
`194`	`194`	`$request = Request::get("{$this->getCompanyId()}/recipients-lists/{$recipientsListId}");`
`195`	`195`	`$response = $this->getConnector()->sendRequest($request);`
`196`		`- return new RecipientsListEntity($response->getContent());`
	`196`	`+ return new RecipientsListEntity($response->getContent(), true);`
`197`	`197`	`}`
`198`	`198`
`199`	`199`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public function getSenderEmails()`
`22`	`22`	`$data = Json::decode($response->getContent());`
`23`	`23`	`$json = new stdClass();`
`24`	`24`	`$json->emails = $data;`
`25`		`- return new SenderEmailsEntity($json);`
	`25`	`+ return new SenderEmailsEntity($json, true);`
`26`	`26`	`}`
`27`	`27`
`28`	`28`
`@@ -34,7 +34,7 @@ public function getSenderEmail($senderEmailId)`
`34`	`34`	`{`
`35`	`35`	`$request = Request::get("{$this->getCompanyId()}/sender-emails/{$senderEmailId}");`
`36`	`36`	`$response = $this->getConnector()->sendRequest($request);`
`37`		`- return new SenderEmailEntity($response->getContent());`
	`37`	`+ return new SenderEmailEntity($response->getContent(), true);`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,15 +41,15 @@ public function sendSmsBatch(SmsBatchEntity $batch, $smsNotificationId)`
`41`	`41`	`$request = Request::post("{$this->getCompanyId()}/sms-notifications/{$smsNotificationId}/batch/data");`
`42`	`42`	`$request->setContentAsEntity($batch);`
`43`	`43`	`$this->getConnector()->sendRequest($request);`
`44`		`- return new SmsBatchResultEntity($request->getContent());`
	`44`	`+ return new SmsBatchResultEntity($request->getContent(), true);`
`45`	`45`	`}`
`46`	`46`
`47`	`47`
`48`	`48`	`public function getSms($smsNotificationId, $smsId)`
`49`	`49`	`{`
`50`	`50`	`$request = Request::get("{$this->getCompanyId()}/sms-notifications/{$smsNotificationId}/data/{$smsId}");`
`51`	`51`	`$response = $this->getConnector()->sendRequest($request);`
`52`		`- return new SmsEntity($response->getContent());`
	`52`	`+ return new SmsEntity($response->getContent(), true);`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`/**`
`@@ -95,7 +95,7 @@ public function getSmsNotifications()`
`95`	`95`	`$data = Json::decode($response->getContent());`
`96`	`96`	`$json = new stdClass();`
`97`	`97`	`$json->smsNotifications = $data;`
`98`		`- return new SmsNotificationsEntity($json);`
	`98`	`+ return new SmsNotificationsEntity($json, true);`
`99`	`99`	`}`
`100`	`100`
`101`	`101`
`@@ -108,7 +108,7 @@ public function getSmsNotification($smsNotificationId)`
`108`	`108`	`{`
`109`	`109`	`$request = Request::get("{$this->getCompanyId()}/sms-notifications/{$smsNotificationId}");`
`110`	`110`	`$response = $this->getConnector()->sendRequest($request);`
`111`		`- return new SmsNotificationEntity($response->getContent());`
	`111`	`+ return new SmsNotificationEntity($response->getContent(), true);`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`}`