volkszaehler/volkszaehler.org — pull request #75 by andig (2013-12-15 10:48:01+00:00)
Title: Abhängigkeiten (Doctrine ORM) per Composer installieren, 3. Anlauf

Der PR ist lt. GitHub jetzt gut. Keine Ahnung warum es bisher damit ein Problem mit #58 gab.
Auch lokal kann ich die Änderung von @r3wald mergen:

C:\data\htdocs\vz>git fetch r3wald
remote: Counting objects: 160, done.
remote: Compressing objects: 100% (65/65), done.
remote: Total 103 (delta 60), reused 70 (delta 2R7)
Receiving objects: 100% (103/103), 15.63 KiB, done.
Resolving deltas: 100% (60/60), completed with 16 local objects.
From https://github.com/r3wald/volkszaehler.org
* [new branch] dependency-injection -> r3wald/dependency-injection
* [new branch] master -> r3wald/master
* [new branch] unittests -> r3wald/unittests

C:\data\htdocs\vz>git merge r3wald/master
Removing lib/vendor/README
Auto-merging lib/Volkszaehler/View/JpGraph.php
Auto-merging lib/Volkszaehler/Router.php
Auto-merging lib/Volkszaehler/Definition/PropertyDefinition.php
Auto-merging lib/Volkszaehler/Definition/EntityDefinition.php
Auto-merging lib/Volkszaehler/Definition/Definition.php
Removing lib/Util/ClassLoader.php
Merge made by the 'recursive' strategy.
.gitignore | 3 +-
INSTALL | 5 +
composer.json | 23 +
composer.lock | 1078 ++++++++++++++++++++
etc/volkszaehler.conf.template.php | 9 -
htdocs/middleware.php | 18 +-
lib/Util/ClassLoader.php | 215 ----
.../Controller/AggregatorController.php | 0
.../Controller/CapabilitiesController.php | 0
.../Controller/ChannelController.php | 0
lib/{ => Volkszaehler}/Controller/Controller.php | 0
.../Controller/DataController.php | 0
.../Controller/EntityController.php | 0
lib/{ => Volkszaehler}/Definition/Definition.php | 2 +-
.../Definition/EntityDefinition.json | 0
.../Definition/EntityDefinition.php | 6 +-
.../Definition/PropertyDefinition.json | 0
.../Definition/PropertyDefinition.php | 2 +-
.../Interpreter/AggregatorInterpreter.php | 0
.../Interpreter/CounterInterpreter.php | 0
.../Interpreter/DataIterator.php | 0
lib/{ => Volkszaehler}/Interpreter/Interpreter.php | 0
.../Interpreter/MeterInterpreter.php | 0
.../Interpreter/SensorInterpreter.php | 0
lib/{ => Volkszaehler}/Model/Aggregator.php | 0
lib/{ => Volkszaehler}/Model/Channel.php | 0
lib/{ => Volkszaehler}/Model/Data.php | 0
lib/{ => Volkszaehler}/Model/Entity.php | 0
lib/{ => Volkszaehler}/Model/Property.php | 0
lib/{ => Volkszaehler}/Router.php | 11 +-
lib/{ => Volkszaehler}/Util/Configuration.php | 0
lib/{ => Volkszaehler}/Util/Debug.php | 0
lib/{ => Volkszaehler}/Util/JSON.php | 0
lib/{ => Volkszaehler}/Util/Random.php | 0
lib/{ => Volkszaehler}/Util/UUID.php | 0
lib/{ => Volkszaehler}/View/CSV.php | 0
lib/{ => Volkszaehler}/View/HTTP/Request.php | 0
lib/{ => Volkszaehler}/View/HTTP/Response.php | 0
lib/{ => Volkszaehler}/View/JSON.php | 0
lib/{ => Volkszaehler}/View/JpGraph.php | 4 -
lib/{ => Volkszaehler}/View/View.php | 0
lib/{ => Volkszaehler}/View/XML.php | 0
lib/vendor/README | 7 -
misc/tests/big_channel_data.php | 19 +-
misc/tests/configuration.php | 2 +-
misc/tests/debug.php | 3 +-
misc/tests/json.php | 2 +-
misc/tests/properties.php | 4 +-
misc/tests/random.php | 4 +-
misc/tools/doctrine.php | 18 +-
misc/tools/install.sh | 46 +-
misc/tools/vzcompress2.php | 2 +-
52 files changed, 1153 insertions(+), 330 deletions(-)
create mode 100644 composer.json
create mode 100644 composer.lock
delete mode 100644 lib/Util/ClassLoader.php
rename lib/{ => Volkszaehler}/Controller/AggregatorController.php (100%)
rename lib/{ => Volkszaehler}/Controller/CapabilitiesController.php (100%)
rename lib/{ => Volkszaehler}/Controller/ChannelController.php (100%)
rename lib/{ => Volkszaehler}/Controller/Controller.php (100%)
rename lib/{ => Volkszaehler}/Controller/DataController.php (100%)
rename lib/{ => Volkszaehler}/Controller/EntityController.php (100%)
rename lib/{ => Volkszaehler}/Definition/Definition.php (97%)
rename lib/{ => Volkszaehler}/Definition/EntityDefinition.json (100%)
rename lib/{ => Volkszaehler}/Definition/EntityDefinition.php (94%)
rename lib/{ => Volkszaehler}/Definition/PropertyDefinition.json (100%)
rename lib/{ => Volkszaehler}/Definition/PropertyDefinition.php (98%)
rename lib/{ => Volkszaehler}/Interpreter/AggregatorInterpreter.php (100%)
rename lib/{ => Volkszaehler}/Interpreter/CounterInterpreter.php (100%)
rename lib/{ => Volkszaehler}/Interpreter/DataIterator.php (100%)
rename lib/{ => Volkszaehler}/Interpreter/Interpreter.php (100%)
rename lib/{ => Volkszaehler}/Interpreter/MeterInterpreter.php (100%)
rename lib/{ => Volkszaehler}/Interpreter/SensorInterpreter.php (100%)
rename lib/{ => Volkszaehler}/Model/Aggregator.php (100%)
rename lib/{ => Volkszaehler}/Model/Channel.php (100%)
rename lib/{ => Volkszaehler}/Model/Data.php (100%)
rename lib/{ => Volkszaehler}/Model/Entity.php (100%)
rename lib/{ => Volkszaehler}/Model/Property.php (100%)
rename lib/{ => Volkszaehler}/Router.php (95%)
rename lib/{ => Volkszaehler}/Util/Configuration.php (100%)
rename lib/{ => Volkszaehler}/Util/Debug.php (100%)
rename lib/{ => Volkszaehler}/Util/JSON.php (100%)
rename lib/{ => Volkszaehler}/Util/Random.php (100%)
rename lib/{ => Volkszaehler}/Util/UUID.php (100%)
rename lib/{ => Volkszaehler}/View/CSV.php (100%)
rename lib/{ => Volkszaehler}/View/HTTP/Request.php (100%)
rename lib/{ => Volkszaehler}/View/HTTP/Response.php (100%)
rename lib/{ => Volkszaehler}/View/JSON.php (100%)
rename lib/{ => Volkszaehler}/View/JpGraph.php (97%)
rename lib/{ => Volkszaehler}/View/View.php (100%)
rename lib/{ => Volkszaehler}/View/XML.php (100%)
delete mode 100644 lib/vendor/README