Merge pull request #62 from PavelJurasek/patch-1

Remove usage of Nette\Object class

.travis.yml

@@ -16,12 +16,11 @@ env:
   matrix:
     - NETTE=nette-2.4-dev
     - NETTE=nette-2.4
-    - NETTE=nette-2.3
 
 matrix:
   include:
     - php: 5.6
-      env: NETTE=nette-2.3 COMPOSER_EXTRA_ARGS="--prefer-lowest --prefer-stable"
+      env: NETTE=nette-2.4 COMPOSER_EXTRA_ARGS="--prefer-lowest --prefer-stable"
     - php: 7.0
       env: NETTE=nette-2.4 COVERAGE="--coverage ./coverage.xml --coverage-src ./src" TESTER_RUNTIME="phpdbg"
   exclude:

src/Kdyby/Facebook/Api/CurlClient.php

@@ -31,9 +31,11 @@
  * @method onError(\Kdyby\Facebook\Exception $e, array $info)
  * @method onSuccess(array $result, array $info)
  */
-class CurlClient extends Nette\Object implements Facebook\ApiClient
+class CurlClient implements Facebook\ApiClient
 {
 
+	use Nette\SmartObject;
+
 	/**
 	 * Default options for curl.
 	 * @var array

src/Kdyby/Facebook/Configuration.php

@@ -18,9 +18,11 @@
 /**
  * @author Filip Procházka <[email protected]>
  */
-class Configuration extends Nette\Object
+class Configuration
 {
 
+	use Nette\SmartObject;
+
 	/** @deprecated */
 	const USER_EMAIL = 'email';
 	/** @deprecated */

src/Kdyby/Facebook/Diagnostics/Panel.php

@@ -26,9 +26,11 @@
  * @property callable $failure
  * @property callable $success
  */
-class Panel extends Nette\Object implements IBarPanel
+class Panel implements IBarPanel
 {
 
+	use Nette\SmartObject;
+
 	/**
 	 * @var int logged time
 	 */

src/Kdyby/Facebook/Facebook.php

@@ -29,9 +29,11 @@
  *
  * @author Naitik Shah <[email protected]>
  */
-class Facebook extends Nette\Object
+class Facebook
 {
 
+	use Nette\SmartObject;
+
 	/**
 	 * Version.
 	 */

src/Kdyby/Facebook/Helpers.php

@@ -11,17 +11,17 @@
 namespace Kdyby\Facebook;
 
 use Nette;
-use Tracy\Debugger;
-use Nette\Utils\Strings;
 
 
 
 /**
  * @author Filip Procházka <[email protected]>
  */
-class Helpers extends Nette\Object
+class Helpers
 {
 
+	use Nette\SmartObject;
+
 	/**
 	 * Return true if this is video post.
 	 *

src/Kdyby/Facebook/Profile.php

@@ -22,9 +22,11 @@
  * @property string $pictureUrl
  * @property array $permissions
  */
-class Profile extends Nette\Object
+class Profile
 {
 
+	use Nette\SmartObject;
+
 	/**
 	 * @var Facebook
 	 */

src/Kdyby/Facebook/Resource/ResourceIterator.php

@@ -12,17 +12,19 @@
 
 use Iterator;
 use IteratorIterator;
-use Nette\Object;
+use Nette\SmartObject;
 use Nette\Utils\ArrayHash;
 
 
 
 /**
  * @author Martin Štekl <[email protected]>
  */
-class ResourceIterator extends Object implements Iterator
+class ResourceIterator implements Iterator
 {
 
+	use SmartObject;
+
 	/**
 	 * @var \Kdyby\Facebook\Resource\IResourceLoader
 	 */

src/Kdyby/Facebook/Resource/ResourceLoader.php

@@ -12,7 +12,7 @@
 
 use IteratorAggregate;
 use Kdyby\Facebook\Facebook;
-use Nette\Object;
+use Nette\SmartObject;
 use Nette\Utils\ArrayHash;
 use Traversable;
 
@@ -21,9 +21,11 @@
 /**
  * @author Martin Štekl <[email protected]>
  */
-class ResourceLoader extends Object implements IteratorAggregate, IResourceLoader
+class ResourceLoader implements IteratorAggregate, IResourceLoader
 {
 
+	use SmartObject;
+
 	/**
 	 * @var \Kdyby\Facebook\Facebook
 	 */

src/Kdyby/Facebook/SessionStorage.php

@@ -23,9 +23,11 @@
  * @property string $access_token
  * @property string $user_id
  */
-class SessionStorage extends Nette\Object
+class SessionStorage
 {
 
+	use Nette\SmartObject;
+
 	const FBSS_COOKIE_NAME = 'fbss';
 
 	// We can set this to a high number because the main session

src/Kdyby/Facebook/SignedRequest.php

@@ -20,9 +20,11 @@
 /**
  * @author Filip Procházka <[email protected]>
  */
-class SignedRequest extends Nette\Object
+class SignedRequest
 {
 
+	use Nette\SmartObject;
+
 	/**
 	 * Parses a signed_request and validates the signature.
 	 *

tests/KdybyTests/Facebook/Facebook_v2_0.phpt

@@ -275,7 +275,7 @@ class Facebook_v2_0Test extends FacebookTestCase
 	{
 		$facebook = $this->createWithRequest();
 
-		$response = $facebook->api('/' . $this->testUser->id);
+		$response = $facebook->api('/' . $this->testUser->id . '?fields=id,name,first_name,last_name');
 		Assert::true(isset($response['id'])); // User ID should be public.
 		Assert::true(isset($response['name'])); // User's name should be public.
 		Assert::true(isset($response['first_name'])); // User's first name should be public.

tests/KdybyTests/Facebook/Facebook_v2_1.phpt

@@ -275,7 +275,7 @@ class Facebook_v2_1Test extends FacebookTestCase
 	{
 		$facebook = $this->createWithRequest();
 
-		$response = $facebook->api('/' . $this->testUser->id);
+		$response = $facebook->api('/' . $this->testUser->id . '?fields=id,name,first_name,last_name');
 		Assert::true(isset($response['id'])); // User ID should be public.
 		Assert::true(isset($response['name'])); // User's name should be public.
 		Assert::true(isset($response['first_name'])); // User's first name should be public.

tests/KdybyTests/Facebook/Facebook_v2_2.phpt

@@ -275,7 +275,7 @@ class Facebook_v2_2Test extends FacebookTestCase
 	{
 		$facebook = $this->createWithRequest();
 
-		$response = $facebook->api('/' . $this->testUser->id);
+		$response = $facebook->api('/' . $this->testUser->id . '?fields=id,name,first_name,last_name');
 		Assert::true(isset($response['id'])); // User ID should be public.
 		Assert::true(isset($response['name'])); // User's name should be public.
 		Assert::true(isset($response['first_name'])); // User's first name should be public.

tests/KdybyTests/Facebook/Facebook_v2_3.phpt

@@ -275,7 +275,7 @@ class Facebook_v2_3Test extends FacebookTestCase
 	{
 		$facebook = $this->createWithRequest();
 
-		$response = $facebook->api('/' . $this->testUser->id);
+		$response = $facebook->api('/' . $this->testUser->id . '?fields=id,name,first_name,last_name');
 		Assert::true(isset($response['id'])); // User ID should be public.
 		Assert::true(isset($response['name'])); // User's name should be public.
 		Assert::true(isset($response['first_name'])); // User's first name should be public.