Merge pull request #7 from seotracker/mickaelandrieu-patch-1

Library update (Hello 2017! Google have updated his search engine)

.travis.yml

@@ -5,7 +5,7 @@ php:
     - 7.0
     - 7.1
 
-install: composer install --prefer-dist --no-interaction
+install: composer install --no-interaction
 
 script:
-    - phpunit
+    - ./vendor/bin/phpunit

Adapter/Crawler/SymfonyCrawler.php

@@ -58,7 +58,7 @@ public function isOk()
      */
     public function get($cssSelector)
     {
-        if (class_exists('Symfony\\Component\\CssSelector\\CssSelector')) {
+        if (class_exists('Symfony\\Component\\CssSelector\\CssSelectorConverter')) {
             return $this->filter($cssSelector);
         }
 

Model/GoogleEngine.php

@@ -30,6 +30,8 @@ class GoogleEngine implements SearchEngineInterface
     private $name;
     private $scrapper;
 
+    const LINK_SELECTOR = "#res div.g h3 > a";
+
     public function __construct(ScrapperInterface $scrapper, CrawlerInterface $crawler, $name = null, $locale = null)
     {
         $this->crawler  = $crawler;
@@ -74,7 +76,7 @@ public function getWebsites($needle, $limit)
 
         $content = $this->scrapper->get($url);
         $crawler = $this->crawler->setContent($content);
-        $links   = $crawler->get('#res li.g > h3 > a');
+        $links   = $crawler->get(self::LINK_SELECTOR);
 
         $websites = new WebsiteCollection();
 
@@ -95,7 +97,7 @@ public function getPosition($needle, WebsiteInterface $website)
         $url = $this->getRootUrl()."q=$needle&gbv=1&num=200";
 
         $crawler = $this->crawler->setContent($this->scrapper->get($url));
-        $links   = $crawler->get('#res li.g > h3 > a');
+        $links   = $crawler->get(self::LINK_SELECTOR);
 
         foreach ($links as $position => $link) {
             $fullLocation = $link->getAttribute('href');
@@ -118,7 +120,7 @@ public function getBacklinks(WebsiteInterface $website)
         $url = $this->getRootUrl().'q=link:"'. $websiteLocation . '"-site:'. $websiteLocation .'&num=100';
 
         $crawler = $this->crawler->setContent($this->scrapper->get($url));
-        $links   = $crawler->get('#res li.g > h3 > a');
+        $links   = $crawler->get(self::LINK_SELECTOR);
 
         foreach ($links as $position => $link) {
             $fullLocation = $link->getAttribute('href');

README.md

@@ -8,7 +8,7 @@ This is a common way to deal with websites, search engines and scrappers.
 [![SensioLabsInsight](https://insight.sensiolabs.com/projects/2c440481-3f27-4b15-a635-e7d701ac1ae4/small.png)](https://insight.sensiolabs.com/projects/2c440481-3f27-4b15-a635-e7d701ac1ae4)
 
 
-1) Websites
+## Websites
 -----------
 
 Website is an object representation of a real website.
@@ -23,7 +23,7 @@ A website object can return useful data for SEO like:
 
 See ``WebsiteInterface`` for more information about it.
 
-2) SearchEngines
+## SearchEngines
 ----------------
 
 SearchEngine is an object representation of a real search engine.
@@ -37,7 +37,7 @@ A search engine can return useful datas for SEO like:
 
 See ``SearchEngineInterface`` for more information about it.
 
-3) Scrappers
+## Scrappers
 ------------
 
 A scrapper is an object used to get HTML from internet network.
@@ -47,7 +47,7 @@ which accept at least 1 argument: an url location.
 
 See ``ScrapperInterface`` and implementations in ``Adapter\Scrapper`` folder
 
-4) Crawlers
+## Crawlers
 -----------
 
 A crawler is an object used to query and manipulate HTML DOM.
@@ -57,7 +57,7 @@ Seo-core offers an interface and his Symfony2-Component based implementation.
 See ``CrawlerInterface`` and implementation in ``Adapter\Crawler`` folder.
 
 
-5) Example
+## Example
 ----------
 
 ```php

Tests/Functional/FunctionalTest.php

@@ -61,7 +61,7 @@ public function testGoogleSearchReturnWebsiteCollection()
 
     public function testGetPositionOnWebsiteReturnInteger()
     {
-        $location = 'http://www.google.fr';
+        $location = 'https://www.google.fr';
         $content = file_get_contents('./Tests/Fixtures/google.html');
         $website = new Website($this->crawler, $content, $location);
         $googleEngine = new GoogleFranceEngine($this->scrapper, $this->crawler);
@@ -72,11 +72,11 @@ public function testGetPositionOnWebsiteReturnInteger()
 
     public function testGetBacklinksReturnArrayOfLinks()
     {
-        $location = 'http://www.google.fr';
+        $location = 'https://www.google.fr';
         $content = file_get_contents('./Tests/Fixtures/google.html');
         $googleEngine = new GoogleFranceEngine($this->scrapper, $this->crawler);
         $website = new Website($this->crawler, $content, $location);
 
-        $this->assertEquals(100, count($googleEngine->getBacklinks($website)));
+        $this->assertGreaterThan(30, count($googleEngine->getBacklinks($website)));
     }
 }

composer.json

@@ -7,14 +7,17 @@
     "authors": [
     {
         "name": "Mickaël Andrieu",
-        "email": "mickael.andrieu@hotmail.fr"
+        "email": "mickael.andrieu@solvolabs.com"
     }
     ],
     "require": {
-        "php": ">=5.4.4",
+        "php": ">=5.6",
         "linclark/microdata-php": "2.0.2",
-        "symfony/css-selector": "^2.3|^3.0",
-        "symfony/dom-crawler": "^2.3|^3.0"
+        "symfony/css-selector": "~3.3",
+        "symfony/dom-crawler": "~3.3"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "~4.8"
     },
     "suggest": {
         "ext-curl": "For usage of Curl adapter"