diff --git a/core/composer.json b/core/composer.json index 2cc1671..620ddde 100644 --- a/core/composer.json +++ b/core/composer.json @@ -16,7 +16,7 @@ "guzzle/http": "3.1.0", "kriswallsmith/assetic": "1.1.0-alpha1", "symfony-cmf/routing": "1.0.0-alpha4", - "easyrdf/easyrdf": "dev-master#7ea07f2" + "easyrdf/easyrdf": "0.8.0-beta.1" }, "minimum-stability": "dev" } diff --git a/core/composer.lock b/core/composer.lock index 1c81289..d8bb46f 100644 --- a/core/composer.lock +++ b/core/composer.lock @@ -1,5 +1,5 @@ { - "hash": "373fce59ad113656bb1ead94c948b455", + "hash": "f793e4845cd8ffdbec0ea87fe8b971ce", "packages": [ { "name": "doctrine/common", @@ -72,16 +72,16 @@ }, { "name": "easyrdf/easyrdf", - "version": "dev-master", + "version": "0.8.0-beta.1", "source": { "type": "git", "url": "git://github.com/njh/easyrdf.git", - "reference": "7ea07f2" + "reference": "0.8.0-beta.1" }, "dist": { "type": "zip", - "url": "https://github.com/njh/easyrdf/archive/7ea07f2061000a2c3018f7bba51c653200bd0877.zip", - "reference": "7ea07f2", + "url": "https://github.com/njh/easyrdf/archive/0.8.0-beta.1.zip", + "reference": "0.8.0-beta.1", "shasum": "" }, "require": { @@ -95,7 +95,7 @@ "squizlabs/php_codesniffer": ">=1.4.3", "sami/sami": "dev-master" }, - "time": "2013-01-19 13:23:52", + "time": "2013-01-18 15:54:28", "type": "library", "autoload": { "psr-0": { @@ -964,6 +964,6 @@ "symfony/yaml": 10, "kriswallsmith/assetic": 15, "symfony-cmf/routing": 15, - "easyrdf/easyrdf": 20 + "easyrdf/easyrdf": 10 } } diff --git a/core/vendor/autoload.php b/core/vendor/autoload.php index 9a32426..267eb11 100644 --- a/core/vendor/autoload.php +++ b/core/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer' . '/autoload_real.php'; -return ComposerAutoloaderInite27cba1e63dea46e24d25f6bc817bd8c::getLoader(); +return ComposerAutoloaderInit6ac057e9b4fb2e21eaad5a4f2228dc63::getLoader(); diff --git a/core/vendor/composer/autoload_real.php b/core/vendor/composer/autoload_real.php index c278ca7..58690a4 100644 --- a/core/vendor/composer/autoload_real.php +++ b/core/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php generated by Composer -class ComposerAutoloaderInite27cba1e63dea46e24d25f6bc817bd8c +class ComposerAutoloaderInit6ac057e9b4fb2e21eaad5a4f2228dc63 { private static $loader; @@ -19,9 +19,9 @@ public static function getLoader() return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInite27cba1e63dea46e24d25f6bc817bd8c', 'loadClassLoader')); + spl_autoload_register(array('ComposerAutoloaderInit6ac057e9b4fb2e21eaad5a4f2228dc63', 'loadClassLoader')); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInite27cba1e63dea46e24d25f6bc817bd8c', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit6ac057e9b4fb2e21eaad5a4f2228dc63', 'loadClassLoader')); $vendorDir = dirname(__DIR__); $baseDir = dirname($vendorDir); diff --git a/core/vendor/composer/installed.json b/core/vendor/composer/installed.json index a0d263e..911ca9c 100644 --- a/core/vendor/composer/installed.json +++ b/core/vendor/composer/installed.json @@ -927,17 +927,17 @@ }, { "name": "easyrdf/easyrdf", - "version": "dev-master", - "version_normalized": "9999999-dev", + "version": "0.8.0-beta.1", + "version_normalized": "0.8.0.0-beta1", "source": { "type": "git", "url": "git://github.com/njh/easyrdf.git", - "reference": "7ea07f2" + "reference": "0.8.0-beta.1" }, "dist": { "type": "zip", - "url": "https://github.com/njh/easyrdf/archive/7ea07f2061000a2c3018f7bba51c653200bd0877.zip", - "reference": "7ea07f2", + "url": "https://github.com/njh/easyrdf/archive/0.8.0-beta.1.zip", + "reference": "0.8.0-beta.1", "shasum": "" }, "require": { @@ -951,9 +951,9 @@ "squizlabs/php_codesniffer": ">=1.4.3", "sami/sami": "dev-master" }, - "time": "2013-01-19 13:23:52", + "time": "2013-01-18 15:54:28", "type": "library", - "installation-source": "source", + "installation-source": "dist", "autoload": { "psr-0": { "EasyRdf_": "lib/" diff --git a/core/vendor/easyrdf/easyrdf/.gitignore b/core/vendor/easyrdf/easyrdf/.gitignore deleted file mode 100644 index 0322862..0000000 --- a/core/vendor/easyrdf/easyrdf/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -doap.rdf -docs/api -samicache -lib/arc/ -reports -*.tar.gz -vendor -composer.phar -composer.lock diff --git a/core/vendor/easyrdf/easyrdf/Makefile b/core/vendor/easyrdf/easyrdf/Makefile deleted file mode 100644 index a757d82..0000000 --- a/core/vendor/easyrdf/easyrdf/Makefile +++ /dev/null @@ -1,152 +0,0 @@ -PACKAGE = easyrdf -VERSION = $(shell php -r "print json_decode(file_get_contents('composer.json'))->version;") -distdir = $(PACKAGE)-$(VERSION) -PHP = $(shell which php) -COMPOSER_FLAGS=--no-ansi --no-interaction -PHPUNIT = vendor/bin/phpunit -PHPUNIT_FLAGS = -c config/phpunit.xml -PHPCS = vendor/bin/phpcs -PHPCS_FLAGS = --standard=./config/phpcs_ruleset.xml --encoding=utf8 --extensions=php -SAMI = vendor/bin/sami.php - -# Composer doesn't work with bsdtar - try and use GNU tar -TAR = $(shell which gtar || which gnutar || which tar) - -# Disable copying extended attributes and resource forks on Mac OS X -export COPYFILE_DISABLE=true - -EXAMPLE_FILES = examples/*.php -SOURCE_FILES = lib/EasyRdf.php \ - lib/EasyRdf/*.php \ - lib/EasyRdf/*/*.php -TEST_FILES = test/*/*Test.php \ - test/*/*/*Test.php -TEST_SUPPORT = Makefile test/cli_example_wrapper.php \ - test/TestHelper.php \ - test/EasyRdf/TestCase.php \ - test/EasyRdf/Http/MockClient.php \ - test/EasyRdf/Serialiser/NtriplesArray.php \ - test/fixtures/* -DOC_FILES = docs/*.md \ - docs/api -INFO_FILES = composer.json \ - doap.rdf \ - README.md \ - LICENSE.md \ - CHANGELOG.md - -DISTFILES = $(EXAMPLE_FILES) $(SOURCE_FILES) $(TEST_FILES) \ - $(TEST_SUPPORT) $(INFO_FILES) $(DOC_FILES) - - -.DEFAULT: help -all: help - -# TARGET:test Run all the PHPUnit tests -.PHONY: test -test: $(PHPUNIT) - mkdir -p reports - $(PHP) $(PHPUNIT) $(PHPUNIT_FLAGS) - -# TARGET:test-examples Run PHPUnit tests for each of the examples -.PHONY: test-examples -test-examples: $(PHPUNIT) - mkdir -p reports - $(PHP) $(PHPUNIT) $(PHPUNIT_FLAGS) --testsuite "EasyRdf Examples" - -# TARGET:test-lib Run PHPUnit tests for the library -.PHONY: test-lib -test-lib: $(PHPUNIT) - mkdir -p reports - $(PHP) $(PHPUNIT) $(PHPUNIT_FLAGS) --testsuite "EasyRdf Library" - -# TARGET:coverage Run library tests and generate coverage report -.PHONY: coverage -coverage: $(PHPUNIT) - mkdir -p reports/coverage - $(PHP) $(PHPUNIT) $(PHPUNIT_FLAGS) --coverage-html ./reports/coverage --testsuite "EasyRdf Library" - -# TARGET:apidocs Generate HTML API documentation -.PHONY: apidocs -apidocs: $(SAMI) - $(PHP) $(SAMI) update config/sami.php -n -v --force - -docs/api: apidocs - -doap.rdf: doap.php composer.json vendor/autoload.php - $(PHP) doap.php > doap.rdf - -# TARGET:cs Check the code style of the PHP source code -.PHONY: cs -cs: $(PHPCS) - $(PHPCS) $(PHPCS_FLAGS) lib test - -# TARGET:lint Perform basic PHP syntax check on all files -.PHONY: lint -lint: $(EXAMPLE_FILES) $(SOURCE_FILES) $(TEST_FILES) - @for file in $^; do \ - $(PHP) -l $$file || exit -1; \ - done - -# TARGET:dist Build archives for distribution -.PHONY: dist -dist: $(distdir).tar.gz - rm -Rf $(distdir) - @echo "Done." - -%.tar.gz: % - $(TAR) zcf $@ $^ - -$(distdir): $(DISTFILES) - $(gatherfiles) - -define gatherfiles - @for file in $^; do \ - dir=$@/`dirname "$$file"`; \ - test -d "$$dir" || mkdir -p "$$dir" || exit -1; \ - cp -Rfp "$$file" "$@/$$file" || exit -1; \ - done -endef - -# TARGET:clean Delete any temporary and generated files -.PHONY: clean -clean: - find . -name '.DS_Store' -type f -delete - -rm -Rf $(distdir) reports vendor - -rm -Rf docs/api samicache - -rm -f composer.phar composer.lock - -rm -f doap.rdf - -# TARGET:check-fixme Scan for files containing the words TODO or FIXME -.PHONY: check-fixme -check-fixme: - @git grep -n -E 'FIXME|TODO' || echo "No FIXME or TODO lines found." - -# TARGET:help You're looking at it! -.PHONY: help -help: - # Usage: - # make [OPTION=value] - # - # Targets: - @egrep "^# TARGET:" [Mm]akefile | sed 's/^# TARGET:/# /' - # - # Options: - # PHP Path to php - - - -# Composer rules -composer.phar: - curl -s -z composer.phar -o composer.phar http://getcomposer.org/composer.phar - -composer-install: composer.phar - $(PHP) composer.phar $(COMPOSER_FLAGS) install --dev - -composer-update: clean composer.phar - $(PHP) composer.phar $(COMPOSER_FLAGS) update --dev - -vendor/autoload.php: composer-install -vendor/bin/phpunit: composer-install -vendor/bin/phpcs: composer-install -vendor/bin/sami.php: composer-install