diff options
| -rw-r--r-- | composer-dev.json | 56 | ||||
| -rw-r--r-- | composer.json | 21 | ||||
| -rwxr-xr-x | makesrc.sh | 10 | ||||
| -rw-r--r-- | php-ocramius-proxy-manager-dev.spec | 11 | 
4 files changed, 78 insertions, 20 deletions
diff --git a/composer-dev.json b/composer-dev.json new file mode 100644 index 0000000..48e7d46 --- /dev/null +++ b/composer-dev.json @@ -0,0 +1,56 @@ +{ +    "name":              "ocramius/proxy-manager", +    "description":       "A library providing utilities to generate, instantiate and generally operate with Object Proxies", +    "type":              "library", +    "license":           "MIT", +    "homepage":          "https://github.com/Ocramius/ProxyManager", +    "keywords":          [ +        "proxy", +        "proxy pattern", +        "service proxies", +        "lazy loading", +        "aop" +    ], +    "authors": [ +        { +            "name":     "Marco Pivetta", +            "email":    "ocramius@gmail.com", +            "homepage": "http://ocramius.github.io/" +        } +    ], +    "require": { +        "php":                       "7.0.0 - 7.0.5 || ^7.0.7", +        "zendframework/zend-code":   "3.0.0 - 3.0.2 || ^3.0.4", +        "ocramius/package-versions": "^1.0" +    }, +    "require-dev": { +        "ext-phar":                    "*", +        "phpunit/phpunit":             "^5.4.6", +        "squizlabs/php_codesniffer":   "^2.6.0", +        "couscous/couscous":           "^1.4.0", +        "phpbench/phpbench":            "^0.11.2" +    }, +    "suggest": { +        "ocramius/generated-hydrator": "To have very fast object to array to object conversion for ghost objects", +        "zendframework/zend-xmlrpc":   "To have the XmlRpc adapter (Remote Object feature)", +        "zendframework/zend-json":     "To have the JsonRpc adapter (Remote Object feature)", +        "zendframework/zend-soap":     "To have the Soap adapter (Remote Object feature)" +    }, +    "autoload": { +        "psr-0": { +            "ProxyManager\\": "src" +        } +    }, +    "autoload-dev": { +        "psr-0": { +            "ProxyManagerBench\\": "tests", +            "ProxyManagerTest\\": "tests", +            "ProxyManagerTestAsset\\": "tests" +        } +    }, +    "extra": { +        "branch-alias": { +            "dev-master": "3.0.x-dev" +        } +    } +} diff --git a/composer.json b/composer.json index e3608ff..0c5d206 100644 --- a/composer.json +++ b/composer.json @@ -15,25 +15,24 @@          {              "name":     "Marco Pivetta",              "email":    "ocramius@gmail.com", -            "homepage": "http://ocramius.github.io/" +            "homepage": "http://ocramius.github.com/"          }      ],      "require": { -        "php":                       "7.0.0 - 7.0.5 || ^7.0.7", -        "zendframework/zend-code":   "3.0.0 - 3.0.2 || ^3.0.4", -        "ocramius/package-versions": "^1.0" +        "php":                     ">=5.3.3", +        "zendframework/zend-code": ">2.2.5,<3.0"      },      "require-dev": {          "ext-phar":                    "*", -        "phpunit/phpunit":             "^5.3.4", -        "squizlabs/php_codesniffer":   "^2.6.0", -        "couscous/couscous":           "^1.4.0" +        "phpunit/phpunit":             "~4.0", +        "squizlabs/php_codesniffer":   "1.5.*"      },      "suggest": { +        "zendframework/zend-stdlib":   "To use the hydrator proxy",          "ocramius/generated-hydrator": "To have very fast object to array to object conversion for ghost objects", -        "zendframework/zend-xmlrpc":   "To have the XmlRpc adapter (Remote Object feature)", -        "zendframework/zend-json":     "To have the JsonRpc adapter (Remote Object feature)", -        "zendframework/zend-soap":     "To have the Soap adapter (Remote Object feature)" +        "zendframework/zend-xmlrpc": "To have the XmlRpc adapter (Remote Object feature)", +        "zendframework/zend-json": "To have the JsonRpc adapter (Remote Object feature)", +        "zendframework/zend-soap": "To have the Soap adapter (Remote Object feature)"      },      "autoload": {          "psr-0": { @@ -48,7 +47,7 @@      },      "extra": {          "branch-alias": { -            "dev-master": "3.0.x-dev" +            "dev-master": "2.0.x-dev"          }      }  } @@ -1,10 +1,10 @@  #!/bin/bash  NAME=$(basename $PWD) -OWNER=$(sed   -n '/^%global github_owner/{s/.* //;p}'   $NAME.spec) -PROJECT=$(sed -n '/^%global github_name/{s/.* //;p}'    $NAME.spec) -VERSION=$(sed -n '/^%global github_version/{s/.* //;p}' $NAME.spec) -COMMIT=$(sed  -n '/^%global github_commit/{s/.* //;p}'  $NAME.spec) +OWNER=$(sed   -n '/^%global github_owner/{s/.* //;p}'   $NAME$1.spec) +PROJECT=$(sed -n '/^%global github_name/{s/.* //;p}'    $NAME$1.spec) +VERSION=$(sed -n '/^%global github_version/{s/.* //;p}' $NAME$1.spec) +COMMIT=$(sed  -n '/^%global github_commit/{s/.* //;p}'  $NAME$1.spec)  SHORT=${COMMIT:0:7}  echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION\n" @@ -16,7 +16,7 @@ git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT  echo "Getting commit..."  pushd $PROJECT-$COMMIT  git checkout $COMMIT -cp composer.json ../composer.json +cp composer.json ../composer$1.json  popd  echo "Archiving..." diff --git a/php-ocramius-proxy-manager-dev.spec b/php-ocramius-proxy-manager-dev.spec index 5c8acef..4a04297 100644 --- a/php-ocramius-proxy-manager-dev.spec +++ b/php-ocramius-proxy-manager-dev.spec @@ -12,8 +12,8 @@  %global github_owner      Ocramius  %global github_name       ProxyManager -%global github_version    2.0.3 -%global github_commit     51c7fdd99dba53808aaab21b34f7a55b302c160c +%global github_version    2.0.4 +%global github_commit     a55d08229f4f614bf335759ed0cf63378feeb2e6  %global github_short      %(c=%{github_commit}; echo ${c:0:7})  %global composer_vendor   ocramius @@ -32,7 +32,7 @@  Name:          php-%{composer_vendor}-%{composer_project}  Version:       %{github_version} -Release:       2%{?github_release}%{?dist} +Release:       1%{?github_release}%{?dist}  Summary:       OOP proxy wrappers utilities  Group:         Development/Libraries @@ -62,7 +62,7 @@ BuildRequires: php-composer(ocramius/generated-hydrator) >= 2  BuildRequires: php-pcre  BuildRequires: php-reflection  BuildRequires: php-spl -BuildRequires: php-composer(phpunit/phpunit) >= 5.3.4 +BuildRequires: php-composer(phpunit/phpunit) >= 5.4.6  %endif  # composer.json @@ -164,6 +164,9 @@ rm -rf %{buildroot}  %changelog +* Sun Nov  6 2016 Remi Collet <remi@fedoraproject.org> - 2.0.4-1 +- update to 2.0.4 +  * Wed Oct 19 2016 Remi Collet <remi@fedoraproject.org> - 2.0.3-2  - Add weak dependencies  - Use dependencies' autoloaders  | 
