Merge pull request facebookarchive#901 from yguedidi/remove_deprecation

Remove deprecation

Author: yguedidi

CHANGELOG.md

@@ -15,6 +15,12 @@ Starting with version 5, the Facebook PHP SDK follows [SemVer](http://semver.org
   - Removed option `http_client_handler`
   - Added option `http_client` which should be an object implementing `\Http\Client\HttpClient`
   - Removed functions `FacebookClient::setHttpClientHandler()` and `FacebookClient::getHttpClientHandler()` in favor for `FacebookClient::getHttpClient()` and `FacebookClient::setHttpClient()`.
+  - Removed classes `GraphObject`, `GraphList` and `GraphObjectFactory`
+  - Removed functions `AccessTokenMetadata::getProperty`, `GraphNode::getProperty`, `GraphEdge::getProperty`
+  - Removed functions `GraphNode::getPropertyNames`, `GraphEdge::getPropertyNames`
+  - Removed functions `GraphNode::getPropertyNames`, `GraphEdge::getPropertyNames`
+  - Removed functions `Response::getGraphObject`, `Response::getGraphList`
+  - Rename function `GraphNode::getObjectMap` to `GraphNode::getNodeMap`
 
 ## 5.x
 

src/Authentication/AccessTokenMetadata.php

@@ -80,23 +80,6 @@ public function getField($field, $default = null)
         return $default;
     }
 
-    /**
-     * Returns a value from the metadata.
-     *
-     * @param string $field   the property to retrieve
-     * @param mixed  $default the default to return if the property doesn't exist
-     *
-     * @return mixed
-     *
-     * @deprecated 5.0.0 getProperty() has been renamed to getField()
-     *
-     * @todo v6: Remove this method
-     */
-    public function getProperty($field, $default = null)
-    {
-        return $this->getField($field, $default);
-    }
-
     /**
      * Returns a value from a child property in the metadata.
      *

src/GraphNode/Collection.php

@@ -69,23 +69,6 @@ public function getField($name, $default = null)
         return $default;
     }
 
-    /**
-     * Gets the value of the named property for this graph object.
-     *
-     * @param string $name    the property to retrieve
-     * @param mixed  $default the default to return if the property doesn't exist
-     *
-     * @return mixed
-     *
-     * @deprecated 5.0.0 getProperty() has been renamed to getField()
-     *
-     * @todo v6: Remove this method
-     */
-    public function getProperty($name, $default = null)
-    {
-        return $this->getField($name, $default);
-    }
-
     /**
      * Returns a list of all fields set on the object.
      *
@@ -96,20 +79,6 @@ public function getFieldNames()
         return array_keys($this->items);
     }
 
-    /**
-     * Returns a list of all properties set on the object.
-     *
-     * @return array
-     *
-     * @deprecated 5.0.0 getPropertyNames() has been renamed to getFieldNames()
-     *
-     * @todo v6: Remove this method
-     */
-    public function getPropertyNames()
-    {
-        return $this->getFieldNames();
-    }
-
     /**
      * Get all of the items in the collection.
      *

src/GraphNode/GraphAchievement.php

@@ -30,7 +30,7 @@ class GraphAchievement extends GraphNode
     /**
      * @var array maps object key names to Graph object types
      */
-    protected static $graphObjectMap = [
+    protected static $graphNodeMap = [
         'from' => GraphUser::class,
         'application' => GraphApplication::class,
     ];

src/GraphNode/GraphAlbum.php

@@ -31,7 +31,7 @@ class GraphAlbum extends GraphNode
     /**
      * @var array maps object key names to Graph object types
      */
-    protected static $graphObjectMap = [
+    protected static $graphNodeMap = [
         'from' => GraphUser::class,
         'place' => GraphPage::class,
     ];

src/GraphNode/GraphEvent.php

@@ -30,7 +30,7 @@ class GraphEvent extends GraphNode
     /**
      * @var array maps object key names to GraphNode types
      */
-    protected static $graphObjectMap = [
+    protected static $graphNodeMap = [
         'cover' => GraphCoverPhoto::class,
         'place' => GraphPage::class,
         'picture' => GraphPicture::class,

src/GraphNode/GraphGroup.php

@@ -30,7 +30,7 @@ class GraphGroup extends GraphNode
     /**
      * @var array maps object key names to GraphNode types
      */
-    protected static $graphObjectMap = [
+    protected static $graphNodeMap = [
         'cover' => GraphCoverPhoto::class,
         'venue' => GraphLocation::class,
     ];

src/GraphNode/GraphList.php

@@ -30,7 +30,7 @@ class GraphNode extends Collection
     /**
      * @var array maps object key names to Graph object types
      */
-    protected static $graphObjectMap = [];
+    protected static $graphNodeMap = [];
 
     /**
      * Init this Graph object.
@@ -184,12 +184,12 @@ public function castToBirthday($value)
     }
 
     /**
-     * Getter for $graphObjectMap.
+     * Getter for $graphNodeMap.
      *
      * @return array
      */
-    public static function getObjectMap()
+    public static function getNodeMap()
     {
-        return static::$graphObjectMap;
+        return static::$graphNodeMap;
     }
 }

src/GraphNode/GraphNode.php

@@ -265,12 +265,12 @@ public function safelyMakeGraphNode(array $data, $subclassName = null)
         foreach ($data as $k => $v) {
             // Array means could be recurable
             if (is_array($v)) {
-                // Detect any smart-casting from the $graphObjectMap array.
+                // Detect any smart-casting from the $graphNodeMap array.
                 // This is always empty on the GraphNode collection, but subclasses can define
                 // their own array of smart-casting types.
-                $graphObjectMap = $subclassName::getObjectMap();
-                $objectSubClass = isset($graphObjectMap[$k])
-                    ? $graphObjectMap[$k]
+                $graphNodeMap = $subclassName::getNodeMap();
+                $objectSubClass = isset($graphNodeMap[$k])
+                    ? $graphNodeMap[$k]
                     : null;
 
                 // Could be a GraphEdge or GraphNode