Merge pull request #39 from ARCANEDEV/port-changes

Port the latest changes
ARCANEDEV · Feb 16, 2018 · 7da1518 · 7da1518
2 parents 5d2181e + 0ae30e4
commit 7da1518
Show file tree

Hide file tree

Showing 9 changed files with 325 additions and 65 deletions.
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2017 | ARCANEDEV <[email protected]> - SEO Helper
+Copyright (c) 2015-2018 | ARCANEDEV <[email protected]> - SEO Helper
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
     "license": "MIT",
     "require": {
         "php":               ">=7.0",
-        "arcanedev/support": "~4.2"
+        "arcanedev/support": "~4.2.0"
     },
     "require-dev": {
         "orchestra/testbench": "~3.5.0",

diff --git a/src/Contracts/Entities/MiscTags.php b/src/Contracts/Entities/MiscTags.php
@@ -14,6 +14,7 @@ interface MiscTags extends Renderable
      |  Getters & Setters
      | -----------------------------------------------------------------
      */
+
     /**
      * Get the current URL.
      *
@@ -30,10 +31,18 @@ public function getUrl();
      */
     public function setUrl($url);
 
+    /**
+     * Get all the metas collection.
+     *
+     * @return \Arcanedev\SeoHelper\Contracts\Entities\MetaCollection
+     */
+    public function all();
+
     /* -----------------------------------------------------------------
      |  Main Methods
      | -----------------------------------------------------------------
      */
+
     /**
      * Make MiscTags instance.
      *

diff --git a/src/Contracts/Entities/Webmasters.php b/src/Contracts/Entities/Webmasters.php
@@ -10,10 +10,23 @@
  */
 interface Webmasters extends Renderable
 {
+    /* -----------------------------------------------------------------
+     |  Getters & Setters
+     | -----------------------------------------------------------------
+     */
+
+    /**
+     * Get all the metas collection.
+     *
+     * @return \Arcanedev\SeoHelper\Contracts\Entities\MetaCollection
+     */
+    public function all();
+
     /* -----------------------------------------------------------------
      |  Main Methods
      | -----------------------------------------------------------------
      */
+
     /**
      * Make Webmaster instance.
      *

diff --git a/src/Contracts/SeoMeta.php b/src/Contracts/SeoMeta.php
@@ -1,5 +1,6 @@
 <?php namespace Arcanedev\SeoHelper\Contracts;
 
+use Arcanedev\SeoHelper\Contracts\Entities\Analytics as AnalyticsContract;
 use Arcanedev\SeoHelper\Contracts\Entities\Description as DescriptionContract;
 use Arcanedev\SeoHelper\Contracts\Entities\Keywords as KeywordsContract;
 use Arcanedev\SeoHelper\Contracts\Entities\MiscTags as MiscTagsContract;
@@ -27,6 +28,13 @@ interface SeoMeta extends Renderable
      */
     public function title(TitleContract $title);
 
+    /**
+     * Get the Title instance.
+     *
+     * @return \Arcanedev\SeoHelper\Contracts\Entities\Title
+     */
+    public function getTitleEntity();
+
     /**
      * Set the Description instance.
      *
@@ -36,6 +44,13 @@ public function title(TitleContract $title);
      */
     public function description(DescriptionContract $description);
 
+    /**
+     * Get the Description instance.
+     *
+     * @return \Arcanedev\SeoHelper\Contracts\Entities\Description
+     */
+    public function getDescriptionEntity();
+
     /**
      * Set the Keywords instance.
      *
@@ -45,6 +60,13 @@ public function description(DescriptionContract $description);
      */
     public function keywords(KeywordsContract $keywords);
 
+    /**
+     * Get the Keywords instance.
+     *
+     * @return \Arcanedev\SeoHelper\Contracts\Entities\Keywords
+     */
+    public function getKeywordsEntity();
+
     /**
      * Set the MiscTags instance.
      *
@@ -54,6 +76,13 @@ public function keywords(KeywordsContract $keywords);
      */
     public function misc(MiscTagsContract $misc);
 
+    /**
+     * Get the MiscTags instance.
+     *
+     * @return \Arcanedev\SeoHelper\Contracts\Entities\MiscTags
+     */
+    public function getMiscEntity();
+
     /**
      * Set the Webmasters instance.
      *
@@ -63,6 +92,29 @@ public function misc(MiscTagsContract $misc);
      */
     public function webmasters(WebmastersContract $webmasters);
 
+    /**
+     * Get the Webmasters instance.
+     *
+     * @return \Arcanedev\SeoHelper\Contracts\Entities\Webmasters
+     */
+    public function getWebmastersEntity();
+
+    /**
+     * Set the Analytics instance.
+     *
+     * @param  \Arcanedev\SeoHelper\Contracts\Entities\Analytics  $analytics
+     *
+     * @return \Arcanedev\SeoHelper\SeoMeta
+     */
+    public function analytics(AnalyticsContract $analytics);
+
+    /**
+     * Get the Analytics instance.
+     *
+     * @return \Arcanedev\SeoHelper\Contracts\Entities\Analytics
+     */
+    public function getAnalyticsEntity();
+
     /**
      * Set the title.
      *

diff --git a/src/Entities/MiscTags.php b/src/Entities/MiscTags.php
@@ -95,6 +95,16 @@ public function setUrl($url)
         return $this;
     }
 
+    /**
+     * Get all the metas collection.
+     *
+     * @return \Arcanedev\SeoHelper\Contracts\Entities\MetaCollection
+     */
+    public function all()
+    {
+        return $this->metas;
+    }
+
     /* -----------------------------------------------------------------
      |  Main Methods
      | -----------------------------------------------------------------

diff --git a/src/Entities/Webmasters.php b/src/Entities/Webmasters.php
@@ -90,6 +90,16 @@ private function getWebmasterName($webmaster)
             : null;
     }
 
+    /**
+     * Get all the metas collection.
+     *
+     * @return \Arcanedev\SeoHelper\Contracts\Entities\MetaCollection
+     */
+    public function all()
+    {
+        return $this->metas;
+    }
+
     /* -----------------------------------------------------------------
      |  Main Methods
      | -----------------------------------------------------------------

diff --git a/src/SeoMeta.php b/src/SeoMeta.php
@@ -138,6 +138,16 @@ public function title(TitleContract $title)
         return $this;
     }
 
+    /**
+     * Get the Title instance.
+     *
+     * @return \Arcanedev\SeoHelper\Contracts\Entities\Title
+     */
+    public function getTitleEntity()
+    {
+        return $this->title;
+    }
+
     /**
      * Set the Description instance.
      *
@@ -152,6 +162,16 @@ public function description(DescriptionContract $description)
         return $this;
     }
 
+    /**
+     * Get the Description instance.
+     *
+     * @return \Arcanedev\SeoHelper\Contracts\Entities\Description
+     */
+    public function getDescriptionEntity()
+    {
+        return $this->description;
+    }
+
     /**
      * Set the Keywords instance.
      *
@@ -166,6 +186,16 @@ public function keywords(KeywordsContract $keywords)
         return $this;
     }
 
+    /**
+     * Get the Keywords instance.
+     *
+     * @return \Arcanedev\SeoHelper\Contracts\Entities\Keywords
+     */
+    public function getKeywordsEntity()
+    {
+        return $this->keywords;
+    }
+
     /**
      * Set the MiscTags instance.
      *
@@ -180,6 +210,16 @@ public function misc(MiscTagsContract $misc)
         return $this;
     }
 
+    /**
+     * Get the MiscTags instance.
+     *
+     * @return  \Arcanedev\SeoHelper\Contracts\Entities\MiscTags
+     */
+    public function getMiscEntity()
+    {
+        return $this->misc;
+    }
+
     /**
      * Set the Webmasters instance.
      *
@@ -194,20 +234,40 @@ public function webmasters(WebmastersContract $webmasters)
         return $this;
     }
 
+    /**
+     * Get the Webmasters instance.
+     *
+     * @return \Arcanedev\SeoHelper\Contracts\Entities\Webmasters
+     */
+    public function getWebmastersEntity()
+    {
+        return $this->webmasters;
+    }
+
     /**
      * Set the Analytics instance.
      *
      * @param  \Arcanedev\SeoHelper\Contracts\Entities\Analytics  $analytics
      *
      * @return \Arcanedev\SeoHelper\SeoMeta
      */
-    private function analytics(AnalyticsContract $analytics)
+    public function analytics(AnalyticsContract $analytics)
     {
         $this->analytics = $analytics;
 
         return $this;
     }
 
+    /**
+     * Get the Analytics instance.
+     *
+     * @return \Arcanedev\SeoHelper\Contracts\Entities\Analytics
+     */
+    public function getAnalyticsEntity()
+    {
+        return $this->analytics;
+    }
+
     /**
      * Set the title.
      *