Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
# Conflicts: # README-en.md # README.md # composer.json # composer.lock # docs/classes/Viessmann.API.ViessmannAPI.html # docs/classes/Viessmann.API.ViessmannApiException.html # docs/classes/Viessmann.API.ViessmannFeature.html # docs/classes/Viessmann.API.proxy.ViessmannFeatureProxy.html # docs/classes/Viessmann.API.proxy.impl.ViessmannFeatureAbstractProxy.html # docs/classes/Viessmann.API.proxy.impl.ViessmannFeatureLocalProxy.html # docs/classes/Viessmann.API.proxy.impl.ViessmannFeatureRemoteProxy.html # docs/files/ViessmannAPI.html # docs/files/ViessmannAPI.php.txt # docs/files/ViessmannApiException.html # docs/files/ViessmannFeature.html # docs/files/ViessmannFeature.php.txt # docs/files/proxy.ViessmannFeatureProxy.html # docs/files/proxy.impl.ViessmannFeatureAbstractProxy.html # docs/files/proxy.impl.ViessmannFeatureLocalProxy.html # docs/files/proxy.impl.ViessmannFeatureRemoteProxy.html # docs/files/proxy/impl/ViessmannFeatureRemoteProxy.php.txt # docs/graphs/class.html # docs/graphs/classes.svg # docs/index.html # docs/namespaces/Viessmann.API.html # docs/namespaces/Viessmann.API.proxy.html # docs/namespaces/Viessmann.API.proxy.impl.html # docs/namespaces/Viessmann.html # docs/namespaces/default.html # docs/phpdoc-cache-4b/phpdoc-cache-file_02b0507e52a43dd8b19991035938b7e5.dat # docs/phpdoc-cache-aa/phpdoc-cache-file_411ced7a319b3f3b488dca40b8d61055.dat # docs/reports/deprecated.html # docs/reports/errors.html # docs/reports/markers.html # example/GetAllInformationJeedom.php # example/SetCurve.php # example/Viessmann-Api-1.4.0-SNAPSHOT.phar # example/bootstrap.php # resources/features.zip # src/API/ViessmannAPI.php # src/API/ViessmannFeature.php # src/API/proxy/impl/ViessmannFeatureRemoteProxy.php # src/Oauth/ViessmannOauthService.php # src/test/ViessmannApiTest.php # src/test/resources/features/heating/heating.solar.power.cumulativeProduced.json # src/test/resources/features/heating/heating.solar.pumps.circuit.json # src/test/resources/features/heating/heating.solar.rechargeSuppression.json # src/test/resources/features/heating/heating.solar.sensors.temperature.dhw.json # src/test/resources/features/heating/heating.solar.statistics.json # vendor/autoload.php # vendor/beberlei/assert/composer.json # vendor/beberlei/assert/lib/Assert/Assertion.php # vendor/composer/autoload_classmap.php # vendor/composer/autoload_files.php # vendor/composer/autoload_namespaces.php # vendor/composer/autoload_psr4.php # vendor/composer/autoload_real.php # vendor/composer/autoload_static.php # vendor/composer/installed.json # vendor/doctrine/instantiator/README.md # vendor/doctrine/instantiator/composer.json # vendor/doctrine/instantiator/src/Doctrine/Instantiator/Exception/ExceptionInterface.php # vendor/doctrine/instantiator/src/Doctrine/Instantiator/Exception/InvalidArgumentException.php # vendor/doctrine/instantiator/src/Doctrine/Instantiator/Exception/UnexpectedValueException.php # vendor/doctrine/instantiator/src/Doctrine/Instantiator/Instantiator.php # vendor/doctrine/instantiator/src/Doctrine/Instantiator/InstantiatorInterface.php # vendor/myclabs/deep-copy/src/DeepCopy/DeepCopy.php # vendor/phpdocumentor/reflection-common/.travis.yml # vendor/phpdocumentor/reflection-common/README.md # vendor/phpdocumentor/reflection-common/composer.json # vendor/phpdocumentor/reflection-common/src/Element.php # vendor/phpdocumentor/reflection-common/src/File.php # vendor/phpdocumentor/reflection-common/src/Fqsen.php # vendor/phpdocumentor/reflection-common/src/Location.php # vendor/phpdocumentor/reflection-common/src/Project.php # vendor/phpdocumentor/reflection-common/src/ProjectFactory.php # vendor/phpdocumentor/reflection-docblock/composer.json # vendor/phpdocumentor/reflection-docblock/src/DocBlock/Tags/Generic.php # vendor/phpdocumentor/type-resolver/README.md # vendor/phpdocumentor/type-resolver/composer.json # vendor/phpdocumentor/type-resolver/src/FqsenResolver.php # vendor/phpdocumentor/type-resolver/src/Type.php # vendor/phpdocumentor/type-resolver/src/TypeResolver.php # vendor/phpdocumentor/type-resolver/src/Types/Array_.php # vendor/phpdocumentor/type-resolver/src/Types/Boolean.php # vendor/phpdocumentor/type-resolver/src/Types/Callable_.php # vendor/phpdocumentor/type-resolver/src/Types/Compound.php # vendor/phpdocumentor/type-resolver/src/Types/Context.php # vendor/phpdocumentor/type-resolver/src/Types/ContextFactory.php # vendor/phpdocumentor/type-resolver/src/Types/Float_.php # vendor/phpdocumentor/type-resolver/src/Types/Integer.php # vendor/phpdocumentor/type-resolver/src/Types/Iterable_.php # vendor/phpdocumentor/type-resolver/src/Types/Mixed_.php # vendor/phpdocumentor/type-resolver/src/Types/Null_.php # vendor/phpdocumentor/type-resolver/src/Types/Nullable.php # vendor/phpdocumentor/type-resolver/src/Types/Object_.php # vendor/phpdocumentor/type-resolver/src/Types/Parent_.php # vendor/phpdocumentor/type-resolver/src/Types/Resource_.php # vendor/phpdocumentor/type-resolver/src/Types/Scalar.php # vendor/phpdocumentor/type-resolver/src/Types/Self_.php # vendor/phpdocumentor/type-resolver/src/Types/Static_.php # vendor/phpdocumentor/type-resolver/src/Types/String_.php # vendor/phpdocumentor/type-resolver/src/Types/This.php # vendor/phpdocumentor/type-resolver/src/Types/Void_.php # vendor/phpspec/prophecy/CHANGES.md # vendor/phpspec/prophecy/README.md # vendor/phpspec/prophecy/composer.json # vendor/phpspec/prophecy/src/Prophecy/Call/CallCenter.php # vendor/phpspec/prophecy/src/Prophecy/Doubler/ClassPatch/DisableConstructorPatch.php # vendor/phpspec/prophecy/src/Prophecy/Doubler/Generator/ClassMirror.php # vendor/phpspec/prophecy/src/Prophecy/Promise/ThrowPromise.php # vendor/phpspec/prophecy/src/Prophecy/Prophecy/MethodProphecy.php # vendor/phpunit/php-code-coverage/composer.json # vendor/phpunit/php-code-coverage/src/Exception/InvalidArgumentException.php # vendor/phpunit/php-code-coverage/src/Node/Builder.php # vendor/phpunit/php-code-coverage/src/Node/File.php # vendor/phpunit/php-code-coverage/src/Report/Clover.php # vendor/phpunit/php-code-coverage/src/Report/Html/Renderer.php # vendor/phpunit/php-code-coverage/src/Report/Html/Renderer/Dashboard.php # vendor/phpunit/php-code-coverage/src/Report/Html/Renderer/File.php # vendor/phpunit/php-code-coverage/src/Report/Html/Renderer/Template/css/style.css # vendor/phpunit/php-code-coverage/src/Report/Text.php # vendor/phpunit/php-code-coverage/src/Report/Xml/Tests.php # vendor/phpunit/php-code-coverage/src/Version.php # vendor/phpunit/php-code-coverage/tests/_files/BankAccount-clover.xml # vendor/phpunit/php-code-coverage/tests/_files/Report/HTML/CoverageForBankAccount/BankAccount.php.html # vendor/phpunit/php-code-coverage/tests/_files/Report/HTML/CoverageForBankAccount/dashboard.html # vendor/phpunit/php-code-coverage/tests/_files/Report/HTML/CoverageForBankAccount/index.html # vendor/phpunit/php-code-coverage/tests/_files/Report/HTML/CoverageForClassWithAnonymousFunction/dashboard.html # vendor/phpunit/php-code-coverage/tests/_files/Report/HTML/CoverageForClassWithAnonymousFunction/index.html # vendor/phpunit/php-code-coverage/tests/_files/Report/HTML/CoverageForClassWithAnonymousFunction/source_with_class_and_anonymous_function.php.html # vendor/phpunit/php-code-coverage/tests/_files/Report/HTML/CoverageForFileWithIgnoredLines/dashboard.html # vendor/phpunit/php-code-coverage/tests/_files/Report/HTML/CoverageForFileWithIgnoredLines/index.html # vendor/phpunit/php-code-coverage/tests/_files/Report/HTML/CoverageForFileWithIgnoredLines/source_with_ignore.php.html # vendor/phpunit/php-code-coverage/tests/_files/Report/XML/CoverageForBankAccount/BankAccount.php.xml # vendor/phpunit/php-code-coverage/tests/_files/Report/XML/CoverageForClassWithAnonymousFunction/source_with_class_and_anonymous_function.php.xml # vendor/phpunit/php-code-coverage/tests/_files/Report/XML/CoverageForFileWithIgnoredLines/source_with_ignore.php.xml # vendor/phpunit/php-code-coverage/tests/_files/class-with-anonymous-function-clover.xml # vendor/phpunit/php-code-coverage/tests/_files/ignored-lines-clover.xml # vendor/phpunit/php-code-coverage/tests/tests/BuilderTest.php # vendor/phpunit/php-file-iterator/composer.json # vendor/phpunit/php-timer/.php_cs.dist # vendor/phpunit/php-timer/.travis.yml # vendor/phpunit/php-timer/ChangeLog.md # vendor/phpunit/php-timer/LICENSE # vendor/phpunit/php-timer/composer.json # vendor/phpunit/php-timer/src/Exception.php # vendor/phpunit/php-timer/src/RuntimeException.php # vendor/phpunit/php-timer/src/Timer.php # vendor/phpunit/php-timer/tests/TimerTest.php # vendor/phpunit/php-token-stream/.travis.yml # vendor/phpunit/php-token-stream/ChangeLog.md # vendor/phpunit/php-token-stream/LICENSE # vendor/phpunit/php-token-stream/composer.json # vendor/phpunit/php-token-stream/phpunit.xml # vendor/phpunit/php-token-stream/src/Token.php # vendor/phpunit/php-token-stream/src/Token/Stream.php # vendor/phpunit/php-token-stream/tests/Token/ClassTest.php # vendor/phpunit/php-token-stream/tests/Token/ClosureTest.php # vendor/phpunit/php-token-stream/tests/Token/FunctionTest.php # vendor/phpunit/php-token-stream/tests/Token/IncludeTest.php # vendor/phpunit/php-token-stream/tests/Token/InterfaceTest.php # vendor/phpunit/php-token-stream/tests/Token/NamespaceTest.php # vendor/phpunit/phpunit/.editorconfig # vendor/phpunit/phpunit/.gitattributes # vendor/phpunit/phpunit/.github/CONTRIBUTING.md # vendor/phpunit/phpunit/.gitignore # vendor/phpunit/phpunit/.php_cs.dist # vendor/phpunit/phpunit/.travis.yml # vendor/phpunit/phpunit/LICENSE # vendor/phpunit/phpunit/README.md # vendor/phpunit/phpunit/build.xml # vendor/phpunit/phpunit/composer.json # vendor/phpunit/phpunit/phive.xml # vendor/phpunit/phpunit/phpunit # vendor/phpunit/phpunit/phpunit.xml # vendor/phpunit/phpunit/phpunit.xsd # vendor/phpunit/phpunit/src/Exception.php # vendor/phpunit/phpunit/src/Framework/Assert.php # vendor/phpunit/phpunit/src/Framework/Assert/Functions.php # vendor/phpunit/phpunit/src/Framework/Constraint/ArraySubset.php # vendor/phpunit/phpunit/src/Framework/Constraint/Count.php # vendor/phpunit/phpunit/src/Framework/Constraint/IsEmpty.php # vendor/phpunit/phpunit/src/Framework/Constraint/IsEqual.php # vendor/phpunit/phpunit/src/Framework/Constraint/StringEndsWith.php # vendor/phpunit/phpunit/src/Framework/Constraint/StringStartsWith.php # vendor/phpunit/phpunit/src/Framework/DataProviderTestSuite.php # vendor/phpunit/phpunit/src/Framework/MockObject/Builder/InvocationMocker.php # vendor/phpunit/phpunit/src/Framework/MockObject/Exception/Exception.php # vendor/phpunit/phpunit/src/Framework/MockObject/Generator.php # vendor/phpunit/phpunit/src/Framework/MockObject/Generator/proxied_method.tpl.dist # vendor/phpunit/phpunit/src/Framework/MockObject/Generator/proxied_method_void.tpl.dist # vendor/phpunit/phpunit/src/Framework/MockObject/Invocation/StaticInvocation.php # vendor/phpunit/phpunit/src/Framework/MockObject/InvocationMocker.php # vendor/phpunit/phpunit/src/Framework/MockObject/Matcher/ConsecutiveParameters.php # vendor/phpunit/phpunit/src/Framework/MockObject/MockObject.php # vendor/phpunit/phpunit/src/Framework/TestCase.php # vendor/phpunit/phpunit/src/Framework/TestResult.php # vendor/phpunit/phpunit/src/Framework/TestSuite.php # vendor/phpunit/phpunit/src/Framework/TestSuiteIterator.php # vendor/phpunit/phpunit/src/Runner/BaseTestRunner.php # vendor/phpunit/phpunit/src/Runner/Filter/GroupFilterIterator.php # vendor/phpunit/phpunit/src/Runner/Filter/NameFilterIterator.php # vendor/phpunit/phpunit/src/Runner/Hook/TestListenerAdapter.php # vendor/phpunit/phpunit/src/Runner/PhptTestCase.php # vendor/phpunit/phpunit/src/Runner/ResultCacheExtension.php # vendor/phpunit/phpunit/src/Runner/TestSuiteSorter.php # vendor/phpunit/phpunit/src/Runner/Version.php # vendor/phpunit/phpunit/src/TextUI/Command.php # vendor/phpunit/phpunit/src/TextUI/ResultPrinter.php # vendor/phpunit/phpunit/src/TextUI/TestRunner.php # vendor/phpunit/phpunit/src/Util/Blacklist.php # vendor/phpunit/phpunit/src/Util/Configuration.php # vendor/phpunit/phpunit/src/Util/Filesystem.php # vendor/phpunit/phpunit/src/Util/Log/JUnit.php # vendor/phpunit/phpunit/src/Util/Log/TeamCity.php # vendor/phpunit/phpunit/src/Util/Printer.php # vendor/phpunit/phpunit/src/Util/Test.php # vendor/phpunit/phpunit/src/Util/TestDox/CliTestDoxPrinter.php # vendor/phpunit/phpunit/src/Util/TestDox/NamePrettifier.php # vendor/phpunit/phpunit/src/Util/TestDox/XmlResultPrinter.php # vendor/phpunit/phpunit/src/Util/TestResultCache.php # vendor/phpunit/phpunit/tests/_files/CountConstraint.php # vendor/phpunit/phpunit/tests/_files/DataProviderDebugTest.php # vendor/phpunit/phpunit/tests/_files/DataProviderFilterTest.php # vendor/phpunit/phpunit/tests/_files/DataProviderIssue2833/SecondTest.php # vendor/phpunit/phpunit/tests/_files/DataProviderIssue2922/FirstTest.php # vendor/phpunit/phpunit/tests/_files/DataProviderTest.php # vendor/phpunit/phpunit/tests/_files/DataProviderTestDoxTest.php # vendor/phpunit/phpunit/tests/_files/DependencyFailureTest.php # vendor/phpunit/phpunit/tests/_files/ExceptionInTearDownTest.php # vendor/phpunit/phpunit/tests/_files/ExceptionNamespaceTest.php # vendor/phpunit/phpunit/tests/_files/ExceptionTest.php # vendor/phpunit/phpunit/tests/_files/ExceptionWithThrowable.php # vendor/phpunit/phpunit/tests/_files/FunctionCallback.php # vendor/phpunit/phpunit/tests/_files/IgnoreCodeCoverageClassTest.php # vendor/phpunit/phpunit/tests/_files/MultiDependencyTest_result_cache.txt # vendor/phpunit/phpunit/tests/_files/MultipleDataProviderTest.php # vendor/phpunit/phpunit/tests/_files/NamedConstraint.php # vendor/phpunit/phpunit/tests/_files/RequirementsTest.php # vendor/phpunit/phpunit/tests/_files/TestWarning.php # vendor/phpunit/phpunit/tests/_files/TestWithTest.php # vendor/phpunit/phpunit/tests/bootstrap.php # vendor/roave/signature/LICENSE # vendor/sebastian/diff/.gitignore # vendor/sebastian/diff/.travis.yml # vendor/sebastian/diff/ChangeLog.md # vendor/sebastian/diff/LICENSE # vendor/sebastian/diff/composer.json # vendor/sebastian/diff/src/Chunk.php # vendor/sebastian/diff/tests/ChunkTest.php # vendor/sebastian/diff/tests/DifferTest.php # vendor/sebastian/diff/tests/LongestCommonSubsequenceTest.php # vendor/sebastian/diff/tests/ParserTest.php # vendor/sebastian/environment/.gitignore # vendor/sebastian/environment/.travis.yml # vendor/sebastian/environment/ChangeLog.md # vendor/sebastian/environment/LICENSE # vendor/sebastian/environment/README.md # vendor/sebastian/environment/build.xml # vendor/sebastian/environment/composer.json # vendor/sebastian/environment/phpunit.xml # vendor/sebastian/environment/src/Console.php # vendor/sebastian/environment/src/OperatingSystem.php # vendor/sebastian/environment/src/Runtime.php # vendor/sebastian/environment/tests/ConsoleTest.php # vendor/sebastian/environment/tests/OperatingSystemTest.php # vendor/sebastian/environment/tests/RuntimeTest.php # vendor/sebastian/exporter/.gitignore # vendor/sebastian/exporter/.travis.yml # vendor/sebastian/exporter/LICENSE # vendor/sebastian/exporter/README.md # vendor/sebastian/exporter/build.xml # vendor/sebastian/exporter/composer.json # vendor/sebastian/exporter/src/Exporter.php # vendor/sebastian/exporter/tests/ExporterTest.php # vendor/sebastian/resource-operations/build.xml # vendor/sebastian/resource-operations/build/generate.php # vendor/sebastian/resource-operations/composer.json # vendor/symfony/polyfill-ctype/composer.json # vendor/theseer/tokenizer/.gitignore # vendor/theseer/tokenizer/.travis.yml # vendor/theseer/tokenizer/phive.xml # vendor/theseer/tokenizer/src/Tokenizer.php # vendor/theseer/tokenizer/src/XMLSerializer.php # vendor/theseer/tokenizer/tests/XMLSerializerTest.php # vendor/webmozart/assert/CHANGELOG.md # vendor/webmozart/assert/README.md # vendor/webmozart/assert/composer.json # vendor/webmozart/assert/src/Assert.php
- Loading branch information