Skip to content
  • hkreuter's avatar
    b3315365
    Merge branch 'b-6.4.x' into master-merge_b-6.4.x-OXDEV-4946 · b3315365
    hkreuter authored
    # Conflicts:
    #	.github/workflows/build.yml
    #	README.md
    #	composer.json
    #	services.yaml
    #	src/DataType/Filter/BoolFilter.php
    #	src/DataType/Filter/DateFilter.php
    #	src/DataType/Filter/FloatFilter.php
    #	src/DataType/Filter/IDFilter.php
    #	src/DataType/Filter/IntegerFilter.php
    #	src/DataType/Filter/StringFilter.php
    #	src/DataType/Pagination/Pagination.php
    #	src/Event/BeforeTokenCreation.php
    #	src/Framework/RequestReader.php
    #	src/Infrastructure/Legacy.php
    #	src/Service/Authentication.php
    #	src/Service/Authorization.php
    #	tests/Fixtures/testdemodata.sql
    #	tests/Integration/TestCase.php
    #	tests/Unit/Exception/FileUploadExceptionTest.php
    #	tests/Unit/Framework/RequestReaderTest.php
    #	tests/Unit/Service/AuthenticationTest.php
    #	tests/phpunit.xml
    b3315365
    Merge branch 'b-6.4.x' into master-merge_b-6.4.x-OXDEV-4946
    hkreuter authored
    # Conflicts:
    #	.github/workflows/build.yml
    #	README.md
    #	composer.json
    #	services.yaml
    #	src/DataType/Filter/BoolFilter.php
    #	src/DataType/Filter/DateFilter.php
    #	src/DataType/Filter/FloatFilter.php
    #	src/DataType/Filter/IDFilter.php
    #	src/DataType/Filter/IntegerFilter.php
    #	src/DataType/Filter/StringFilter.php
    #	src/DataType/Pagination/Pagination.php
    #	src/Event/BeforeTokenCreation.php
    #	src/Framework/RequestReader.php
    #	src/Infrastructure/Legacy.php
    #	src/Service/Authentication.php
    #	src/Service/Authorization.php
    #	tests/Fixtures/testdemodata.sql
    #	tests/Integration/TestCase.php
    #	tests/Unit/Exception/FileUploadExceptionTest.php
    #	tests/Unit/Framework/RequestReaderTest.php
    #	tests/Unit/Service/AuthenticationTest.php
    #	tests/phpunit.xml
To find the state of this project's repository at the time of any of these versions, check out the tags.
Loading