From 83292f1428e4100725429b79b9b7cedae26de462 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 25 Sep 2017 10:02:50 +0200
Subject: add dependency on nikic/php-parser 3.1.1

---
 composer.json | 10 +++++++---
 phan.spec     | 22 +++++++++++++++-------
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/composer.json b/composer.json
index 121534d..68be4d8 100644
--- a/composer.json
+++ b/composer.json
@@ -1,10 +1,13 @@
 {
-    "name": "etsy/phan",
+    "name": "phan/phan",
     "description": "A static analyzer for PHP",
     "keywords": ["php", "static", "analyzer"],
     "type": "project",
     "license": "MIT",
     "authors": [
+        {
+            "name": "Tyson Andre"
+        },
         {
             "name": "Rasmus Lerdorf"
         },
@@ -16,12 +19,13 @@
         "sort-packages": true
     },
     "require": {
-        "php": "~7.0.0 || ~7.1.0",
+        "php": "~7.0.0 || ~7.1.0 || ~7.2.0",
         "ext-ast": "^0.1.4",
+        "nikic/PHP-Parser": "~3.1.1",
         "symfony/console": "~2.3|~3.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^6.2.1"
+        "phpunit/phpunit": "^6.3.0"
     },
     "autoload": {
         "psr-4": {"Phan\\": "src/Phan"}
diff --git a/phan.spec b/phan.spec
index c3a0050..26b7f3e 100644
--- a/phan.spec
+++ b/phan.spec
@@ -8,7 +8,7 @@
 #
 %global gh_commit    9a559221a31526ff2f09947800cd6cc4ba592ac9
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
-%global gh_owner     etsy
+%global gh_owner     phan
 #global gh_date      20150820
 %global gh_project   phan
 %global psr0         Phan
@@ -31,6 +31,8 @@ BuildArch:      noarch
 %if %{with_tests}
 BuildRequires:  php(language) >= 7.0
 BuildRequires:  php-ast
+BuildRequires:  php-composer(nikic/php-parser) <  4
+BuildRequires:  php-composer(nikic/php-parser) >= 3.1.1
 BuildRequires:  php-composer(symfony/console) <  4
 BuildRequires:  php-composer(symfony/console) >= 2.8
 BuildRequires:  php-reflection
@@ -48,18 +50,21 @@ BuildRequires:  php-date
 BuildRequires:  php-intl
 BuildRequires:  php-soap
 # For tests, from composer.json "require-dev": {
-#        "phpunit/phpunit": "^6.2.1",
-BuildRequires:  phpunit6 >= 6.2.1
+#        "phpunit/phpunit": "^6.3.0",
+BuildRequires:  phpunit6 >= 6.3.0
 %endif
 # For autoloader
 BuildRequires:  php-composer(fedora/autoloader)
 
 # From composer.json, "require": {
-#        "php": "~7.0.0 || ~7.1.0",
+#        "php": "~7.0.0 || ~7.1.0 || ~7.2.0",
 #        "ext-ast": "^0.1.4",
+#        "nikic/PHP-Parser": "~3.1.1",
 #        "symfony/console": "~2.3|~3.0"
 Requires:       php(language) >= 7.0
 Requires:       php-ast
+Requires:       php-composer(nikic/php-parser) <  4
+Requires:       php-composer(nikic/php-parser) >= 3.1.1
 Requires:       php-composer(symfony/console) <  4
 Requires:       php-composer(symfony/console) >= 2.3
 # From phpcompatinfo report for 0.8.4
@@ -79,6 +84,7 @@ Requires:       php-sysvsem
 Requires:       php-composer(fedora/autoloader)
 
 # Composer
+Provides:       php-composer(etsy/%{gh_project})        = %{version}
 Provides:       php-composer(%{gh_owner}/%{gh_project}) = %{version}
 
 
@@ -98,12 +104,13 @@ cat << 'EOF' | tee src/autoload.php
 <?php
 /* Autoloader for etsy/phan and its dependencies */
 
-require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
+require_once '%{_datadir}/php/Fedora/Autoloader/autoload.php';
 \Fedora\Autoloader\Autoload::addPsr4('Phan\\', __DIR__ . '/Phan');
 \Fedora\Autoloader\Dependencies::required([
+    '%{_datadir}/php/PhpParser3/autoload.php',
     [
-        '/usr/share/php/Symfony3/Component/Console/autoload.php',
-        '/usr/share/php/Symfony/Component/Console/autoload.php',
+        '%{_datadir}/php/Symfony3/Component/Console/autoload.php',
+        '%{_datadir}/php/Symfony/Component/Console/autoload.php',
     ],
 ]);
 EOF
@@ -156,6 +163,7 @@ EOF
 %changelog
 * Mon Sep 25 2017 Remi Collet <remi@remirepo.net> - 0.8.8-1
 - Update to 0.8.8
+- add dependency on nikic/php-parser 3.1.1
 
 * Wed Aug 16 2017 Remi Collet <remi@remirepo.net> - 0.8.6-1
 - Update to 0.8.6
-- 
cgit