remicollet · Jun 29, 2016 · Jun 29, 2016 · Jun 29, 2016 · Jun 29, 2016 · Jun 29, 2016
diff --git a/php/php-di/composer.json b/php/php-di/composer.json
@@ -0,0 +1,49 @@
+{
+    "name": "php-di/php-di",
+    "type": "library",
+    "description": "The dependency injection container for humans",
+    "keywords": ["di", "dependency injection", "container"],
+    "homepage": "http://php-di.org/",
+    "license": "MIT",
+    "autoload": {
+        "psr-4": {
+            "DI\\": "src/DI/"
+        },
+        "files": [
+            "src/DI/functions.php"
+        ]
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "DI\\Test\\IntegrationTest\\": "tests/IntegrationTest/",
+            "DI\\Test\\UnitTest\\": "tests/UnitTest/"
+        }
+    },
+    "scripts": {
+        "test": "phpunit"
+    },
+    "require": {
+        "php": ">=5.5.0",
+        "container-interop/container-interop": "~1.0",
+        "php-di/invoker": "^1.1.1",
+        "php-di/phpdoc-reader": "^2.0.1"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "~4.5",
+        "mnapoli/phpunit-easymock": "~0.2.0",
+        "doctrine/cache": "~1.4",
+        "doctrine/annotations": "~1.2",
+        "ocramius/proxy-manager": "~1.0|~2.0"
+    },
+    "replace": {
+        "mnapoli/php-di": "*"
+    },
+    "provide": {
+        "container-interop/container-interop-implementation": "^1.0"
+    },
+    "suggest": {
+        "doctrine/cache": "Install it if you want to use the cache (version ~1.4)",
+        "doctrine/annotations": "Install it if you want to use annotations (version ~1.2)",
+        "ocramius/proxy-manager": "Install it if you want to use lazy injection (version ~1.0 or ~2.0)"
+    }
+}
diff --git a/php/php-di/php-di.spec b/php/php-di/php-di.spec
@@ -12,14 +12,14 @@
 
 %global github_owner     PHP-DI
 %global github_name      PHP-DI
-%global github_version   5.2.2
-%global github_commit    f574bcc841201ab04587b1c6da1234d4044f67d8
+%global github_version   5.3.0
+%global github_commit    854a6d8f54e2146f0a34f0a28f0adea688b634a3
 
 %global composer_vendor  php-di
 %global composer_project php-di
 
-# "php": ">=5.4.0"
-%global php_min_ver 5.4.0
+# "php": ">=5.5.0"
+%global php_min_ver 5.5.0
 # "container-interop/container-interop": "~1.0"
 %global container_interop_min_ver 1.0
 %global container_interop_max_ver 2.0
@@ -38,9 +38,9 @@
 # "php-di/phpdoc-reader": "^2.0.1"
 %global di_phpdoc_reader_min_ver 2.0.1
 %global di_phpdoc_reader_max_ver 3.0
-# "ocramius/proxy-manager": "~1.0"
+# "ocramius/proxy-manager": "~1.0|~2.0"
 %global proxy_manager_min_ver 1.0
-%global proxy_manager_max_ver 2.0
+%global proxy_manager_max_ver 3.0
 
 # Build using "--without tests" to disable tests
 %global with_tests 0%{!?_without_tests:1}
@@ -115,6 +115,7 @@ Suggests:      php-composer(ocramius/proxy-manager)              <  %{proxy_mana
 Provides:      php-%{composer_vendor}-%{composer_project}           = %{version}-%{release}
 # Composer
 Provides:      php-composer(%{composer_vendor}/%{composer_project}) = %{version}
+Provides:      php-composer(container-interop/container-interop-implementation) = 1.0
 
 %description
 %{summary}.
@@ -218,6 +219,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Jun 29 2016 Remi Collet <remi@fedoraproject.org> - 5.3.0-1
+- update to 5.3.0
+- raise dependency on php >=5.5.0
+- allow ocramius/proxy-manager 2.0
+
 * Fri Mar 11 2016 Shawn Iwinski <shawn@iwin.ski> - 5.2.2-1
 - Updated to 5.2.2 (RHBZ #1298928)
 

diff --git a/php/php-ocramius-code-generator-utils/composer.json b/php/php-ocramius-code-generator-utils/composer.json
@@ -0,0 +1,45 @@
+{
+    "name":              "ocramius/code-generator-utils",
+    "description":       "A set of code generator utilities built on top of PHP-Parsers that ease its use when combined with Reflection",
+    "type":              "library",
+    "license":           "MIT",
+    "homepage":          "https://github.com/Ocramius/CodeGenerationUtils",
+    "keywords":          [
+        "reflection",
+        "code generation",
+        "php code",
+        "parser",
+        "compiler"
+    ],
+    "authors": [
+        {
+            "name":     "Marco Pivetta",
+            "email":    "ocramius@gmail.com",
+            "homepage": "http://ocramius.github.com/"
+        }
+    ],
+    "require": {
+        "php":                       "~7.0",
+        "nikic/php-parser":          "~2.0"
+    },
+    "require-dev": {
+        "phpunit/phpunit":           "~5.0",
+        "squizlabs/php_codesniffer": "~2.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "CodeGenerationUtils\\": "src/CodeGenerationUtils"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "CodeGenerationUtilsTests\\":     "tests/CodeGenerationUtilsTests",
+            "CodeGenerationUtilsTestAsset\\": "tests/CodeGenerationUtilsTestAsset"
+        }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.0.x-dev"
+        }
+    }
+}
diff --git a/php/php-ocramius-code-generator-utils/php-ocramius-code-generator-utils.spec b/php/php-ocramius-code-generator-utils/php-ocramius-code-generator-utils.spec
@@ -1,5 +1,6 @@
+# remirepo spec file for php-ocramius-code-generator-utils, from
 #
-# RPM spec file for php-ocramius-code-generator-utils
+# Fedora spec file for php-ocramius-code-generator-utils
 #
 # Copyright (c) 2014-2015 Shawn Iwinski <shawn.iwinski@gmail.com>
 #
@@ -11,17 +12,17 @@
 
 %global github_owner     Ocramius
 %global github_name      CodeGenerationUtils
-%global github_version   0.3.2
-%global github_commit    0e2f6c593fc82801cbb5c8fa90559d923bd1445c
+%global github_version   0.4.0
+%global github_commit    7dc0be1dec3376d95ba094688f0d84f7cf95f300
 
 %global composer_vendor  ocramius
 %global composer_project code-generator-utils
 
-# "php": ">=5.3.3"
-%global php_min_ver 5.3.3
-# "nikic/php-parser": "~1.3"
-%global php_parser_min_ver 1.3
-%global php_parser_max_ver 2
+# "php": "~7.0"
+%global php_min_ver 7.0
+# "nikic/php-parser": "~2.0"
+%global php_parser_min_ver 2.0
+%global php_parser_max_ver 3
 
 # Build using "--without tests" to disable tests
 %global with_tests  %{?_without_tests:0}%{!?_without_tests:1}
@@ -41,13 +42,14 @@ Source0:       %{url}/archive/%{github_commit}/%{name}-%{github_version}-%{githu
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch:     noarch
+BuildRequires: %{_bindir}/phpab
 %if %{with_tests}
 # composer.json
 BuildRequires: php(language) >= %{php_min_ver}
 BuildRequires: php-composer(nikic/php-parser) >= %{php_parser_min_ver}
 BuildRequires: php-composer(nikic/php-parser) <  %{php_parser_max_ver}
-BuildRequires: php-phpunit-PHPUnit
-# phpcompatinfo (computed from version 0.3.0)
+BuildRequires: php-composer(phpunit/phpunit)  >= 5.0
+# phpcompatinfo (computed from version 0.4.0)
 BuildRequires: php-pcre
 BuildRequires: php-reflection
 BuildRequires: php-spl
@@ -57,9 +59,8 @@ BuildRequires: php-spl
 Requires:      php(language) >= %{php_min_ver}
 Requires:      php-composer(nikic/php-parser) >= %{php_parser_min_ver}
 Requires:      php-composer(nikic/php-parser) <  %{php_parser_max_ver}
-# phpcompatinfo (computed from version 0.3.0)
+# phpcompatinfo (computed from version 0.4.0)
 Requires:      php-pcre
-Requires:      php-reflection
 Requires:      php-spl
 
 # Composer
@@ -69,13 +70,18 @@ Provides:      php-composer(%{composer_vendor}/%{composer_project}) = %{version}
 A set of code generator utilities built on top of PHP-Parsers that ease its use
 when combined with Reflection.
 
+Autoloader: %{phpdir}/CodeGenerationUtils/autoload.php
+
 
 %prep
 %setup -qn %{github_name}-%{github_commit}
 
 
 %build
-# Empty build section, nothing required
+%{_bindir}/phpab --output src/CodeGenerationUtils/autoload.php src/CodeGenerationUtils
+cat << 'EOF' | tee -a src/CodeGenerationUtils/autoload.php
+require_once '%{phpdir}/PhpParser2/autoload.php';
+EOF
 
 
 %install
@@ -86,21 +92,13 @@ cp -rp src/* %{buildroot}%{phpdir}/
 
 %check
 %if %{with_tests}
-# Create autoloader
-cat > autoload.php <<'AUTOLOAD'
-<?php
-require_once 'PhpParser/Autoloader.php';
-PhpParser\Autoloader::register();
-
-spl_autoload_register(function ($class) {
-    $src = str_replace('\\', '/', $class).'.php';
-    @include_once $src;
-});
-AUTOLOAD
-
-%{__phpunit} \
-    --bootstrap autoload.php \
-    --include-path %{buildroot}%{phpdir}:./tests
+mkdir vendor
+%{_bindir}/phpab --output vendor/autoload.php tests
+cat << 'EOF' | tee -a vendor/autoload.php
+require_once '%{buildroot}%{phpdir}/CodeGenerationUtils/autoload.php';
+EOF
+
+%{_bindir}/phpunit --verbose
 %else
 : Tests skipped
 %endif
@@ -119,6 +117,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Jun 29 2016 Remi Collet <remi@fedoraproject.org> - 0.4.0-1
+- update to 0.4.0
+- raise dependency on php ~7.0
+- raise dependency on nikic/php-parser ~2.0
+- add simple autoloader
+
 * Sun Aug  9 2015 Remi Collet <remi@fedoraproject.org> - 0.3.2-1
 - update to 0.3.2
 - raise dependency on nikic/php-parser ~1.3

diff --git a/php/php-ocramius-generated-hydrator/composer.json b/php/php-ocramius-generated-hydrator/composer.json
@@ -0,0 +1,50 @@
+{
+    "name":              "ocramius/generated-hydrator",
+    "description":       "An Object Hydrator that allows very fast array to object to array conversion",
+    "type":              "library",
+    "license":           "MIT",
+    "homepage":          "https://github.com/Ocramius/GeneratedHydrator",
+    "minimum-stability": "dev",
+    "keywords":          [
+        "hydrator",
+        "performance",
+        "array conversion",
+        "object conversion",
+        "serializer"
+    ],
+    "authors": [
+        {
+            "name":     "Marco Pivetta",
+            "email":    "ocramius@gmail.com",
+            "homepage": "http://ocramius.github.com/"
+        }
+    ],
+    "require": {
+        "php":                           "~7.0",
+        "nikic/php-parser":              "~2.0",
+        "ocramius/code-generator-utils": "0.4.*",
+        "zendframework/zend-hydrator":   "^2.0"
+    },
+    "require-dev": {
+        "phpunit/phpunit":           "~5.0",
+        "squizlabs/php_codesniffer": "~2.0",
+        "athletic/athletic":         "~0.1.6"
+    },
+    "autoload": {
+        "psr-0": {
+            "GeneratedHydrator\\": "src"
+        }
+    },
+    "autoload-dev": {
+        "psr-0": {
+            "GeneratedHydratorPerformance\\": "tests",
+            "GeneratedHydratorTest\\":        "tests",
+            "GeneratedHydratorTestAsset\\":   "tests"
+        }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.1.x-dev"
+        }
+    }
+}