Skip to content

Commit

Permalink
MERGE: Merge branch '7.3' into 8.0
Browse files Browse the repository at this point in the history
# Conflicts:
#	Neos.Cache/Classes/Backend/PdoBackend.php
#	Neos.Cache/Classes/Backend/RedisBackend.php
#	Neos.Cache/Classes/Backend/SimpleFileBackend.php
#	Neos.Cache/Classes/Frontend/CacheEntryIterator.php
#	Neos.Eel/Classes/FlowQuery/FlowQuery.php
#	Neos.Eel/Classes/FlowQuery/Operations/Object/FilterOperation.php
#	Neos.Eel/Classes/Helper/MathHelper.php
#	Neos.Eel/Classes/Helper/StringHelper.php
#	Neos.Eel/Tests/Unit/Fixtures/TestArrayIterator.php
#	Neos.Eel/composer.json
#	Neos.Flow.Log/Classes/Backend/FileBackend.php
#	Neos.Flow/Classes/Http/Cookie.php
#	Neos.Flow/Classes/Http/Headers.php
#	Neos.Flow/Classes/Mvc/Controller/Arguments.php
#	Neos.Flow/Classes/Persistence/Doctrine/QueryResult.php
#	Neos.Flow/Classes/Reflection/ClassReflection.php
#	Neos.Flow/Classes/Reflection/MethodReflection.php
#	Neos.Flow/Classes/Reflection/ParameterReflection.php
#	Neos.Flow/Classes/Reflection/PropertyReflection.php
#	Neos.Flow/Classes/Validation/Validator/AbstractCompositeValidator.php
#	Neos.Flow/Documentation/TheDefinitiveGuide/PartV/AnnotationReference.rst
#	Neos.Flow/Documentation/TheDefinitiveGuide/PartV/CommandReference.rst
#	Neos.Flow/Documentation/TheDefinitiveGuide/PartV/SignalsReference.rst
#	Neos.Flow/Documentation/TheDefinitiveGuide/PartV/TypeConverterReference.rst
#	Neos.Flow/Documentation/TheDefinitiveGuide/PartV/ValidatorReference.rst
#	Neos.Flow/Tests/Unit/Mvc/Controller/ActionControllerTest.php
#	Neos.Flow/Tests/Unit/Property/TypeConverter/DateTimeConverterTest.php
#	Neos.Flow/composer.json
#	Neos.FluidAdaptor/Tests/Unit/Core/Widget/AbstractWidgetControllerTest.php
#	Neos.FluidAdaptor/Tests/Unit/ViewHelpers/FormViewHelperTest.php
#	Neos.FluidAdaptor/composer.json
#	Neos.Kickstarter/composer.json
#	Neos.Utility.Arrays/Classes/Arrays.php
#	Neos.Utility.ObjectHandling/Classes/TypeHandling.php
#	Neos.Utility.ObjectHandling/Tests/Unit/Fixture/ArrayAccessClass.php
#	Neos.Utility.Unicode/Classes/TextIterator.php
#	psalm-baseline.xml
  • Loading branch information
kdambekalns committed Jul 17, 2023
2 parents 5d349b4 + f24b967 commit eb80af0
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Classes/Files.php
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ public static function copyDirectoryRecursively(string $sourceDirectory, string
* @return mixed The file content as a string or false if the file could not be opened.
* @api
*/
public static function getFileContents(string $pathAndFilename, int $flags = 0, $context = null, int $offset = null, int $maximumLength = -1)
public static function getFileContents(string $pathAndFilename, int $flags = 0, $context = null, int $offset = 0, int $maximumLength = -1)
{
if ($flags === true) {
$flags = FILE_USE_INCLUDE_PATH;
Expand Down

0 comments on commit eb80af0

Please sign in to comment.