Revert "test against master instead of composer version"

Turns out that I have already changed composer to use the git repository

This reverts commit 5d723e58fc.

.travis.yml

@@ -14,8 +14,7 @@ addons:
 
 before_install:
   - git clone https://github.com/piwik/piwik-package.git tmp/piwik-package
-  - git clone https://github.com/matomo-org/searchengine-and-social-list.git tmp/searchengine-and-social-list
+  - composer install
-  - git clone https://github.com/matomo-org/device-detector.git tmp/device-detector
 
 script:
  - 'shellcheck *.sh'

composer.json

@@ -0,0 +1,8 @@
+{
+    "require-dev": {
+    },
+    "require": {
+        "piwik/searchengine-and-social-list": "dev-master",
+        "piwik/device-detector": "dev-master"
+    }
+}

composer.lock

@@ -0,0 +1,147 @@
+{
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "This file is @generated automatically"
+    ],
+    "content-hash": "7b669e7b9119bd3f2e26a451f9ae81c9",
+    "packages": [
+        {
+            "name": "mustangostang/spyc",
+            "version": "0.6.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/mustangostang/spyc.git",
+                "reference": "23c35ae854d835f2d7bcc3e3ad743d7e57a8c14d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/mustangostang/spyc/zipball/23c35ae854d835f2d7bcc3e3ad743d7e57a8c14d",
+                "reference": "23c35ae854d835f2d7bcc3e3ad743d7e57a8c14d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "4.3.*@dev"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "0.5.x-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "Spyc.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "mustangostang",
+                    "email": "vlad.andersen@gmail.com"
+                }
+            ],
+            "description": "A simple YAML loader/dumper class for PHP",
+            "homepage": "https://github.com/mustangostang/spyc/",
+            "keywords": [
+                "spyc",
+                "yaml",
+                "yml"
+            ],
+            "time": "2017-02-24T16:06:33+00:00"
+        },
+        {
+            "name": "piwik/device-detector",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/piwik/device-detector.git",
+                "reference": "12adf85645b92b9c3b574d840bda6309629036f2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/piwik/device-detector/zipball/12adf85645b92b9c3b574d840bda6309629036f2",
+                "reference": "12adf85645b92b9c3b574d840bda6309629036f2",
+                "shasum": ""
+            },
+            "require": {
+                "mustangostang/spyc": "*",
+                "php": ">=5.3.2"
+            },
+            "require-dev": {
+                "fabpot/php-cs-fixer": "~1.7",
+                "matthiasmullie/scrapbook": "@stable",
+                "phpunit/phpunit": "^4.8.36",
+                "psr/cache": "^1.0",
+                "psr/simple-cache": "^1.0"
+            },
+            "suggest": {
+                "doctrine/cache": "Can directly be used for caching purpose"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "DeviceDetector\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-3.0+"
+            ],
+            "authors": [
+                {
+                    "name": "The Piwik Team",
+                    "email": "hello@piwik.org",
+                    "homepage": "http://piwik.org/the-piwik-team/"
+                }
+            ],
+            "description": "The Universal Device Detection library, that parses User Agents and detects devices (desktop, tablet, mobile, tv, cars, console, etc.), clients (browsers, media players, mobile apps, feed readers, libraries, etc), operating systems, devices, brands and models.",
+            "homepage": "http://piwik.org",
+            "keywords": [
+                "devicedetection",
+                "parser",
+                "useragent"
+            ],
+            "time": "2017-11-17T18:05:04+00:00"
+        },
+        {
+            "name": "piwik/searchengine-and-social-list",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/piwik/searchengine-and-social-list.git",
+                "reference": "b6f0671d395139ea6eea31ecab2e303ce5191edf"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/piwik/searchengine-and-social-list/zipball/b6f0671d395139ea6eea31ecab2e303ce5191edf",
+                "reference": "b6f0671d395139ea6eea31ecab2e303ce5191edf",
+                "shasum": ""
+            },
+            "type": "library",
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Public Domain"
+            ],
+            "description": "Search engine and social network definitions used by Piwik",
+            "time": "2017-11-07T08:01:18+00:00"
+        }
+    ],
+    "packages-dev": [],
+    "aliases": [],
+    "minimum-stability": "stable",
+    "stability-flags": {
+        "piwik/searchengine-and-social-list": 20,
+        "piwik/device-detector": 20
+    },
+    "prefer-stable": false,
+    "prefer-lowest": false,
+    "platform": [],
+    "platform-dev": []
+}

tests.py

@@ -54,8 +54,8 @@ min_image_size = 48
 
 placeholder_icon_hash = "398a623a3b0b10eba6d1884b0ff1713ee12aeafaa8efaf67b60a4624f4dce48c"
 
-searchEnginesFile = "tmp/searchengine-and-social-list/SearchEngines.yml"
+searchEnginesFile = "vendor/piwik/searchengine-and-social-list/SearchEngines.yml"
-socialsEnginesFile = "tmp/searchengine-and-social-list/Socials.yml"
+socialsEnginesFile = "vendor/piwik/searchengine-and-social-list/Socials.yml"
 
 
 def print_warning(string):