diff --git a/.evergreen/compile-unix.sh b/.evergreen/compile-unix.sh index 353cecbfb..6d75a70bf 100755 --- a/.evergreen/compile-unix.sh +++ b/.evergreen/compile-unix.sh @@ -65,19 +65,21 @@ esac # Report the current PHP version echo "PHP: `php --version | head -n 1`" -# If we're testing a specific version of libmongoc, update submodule sources +# If we're testing a specific version of libmongoc, update submodule sources and version if [ -n "$LIBMONGOC_VERSION" ]; then + echo "Finding Python3 binary..." + PYTHON="$(bash -c ". $DRIVERS_TOOLS/.evergreen/find-python3.sh && find_python3 2>/dev/null")" + echo "Finding Python3 binary... done." + php scripts/update-submodule-sources.php + + # We invoke python manually as it may not be in the path + pushd src/libmongoc/ + $PYTHON build/calc_release_version.py > ../LIBMONGOC_VERSION_CURRENT + popd fi phpize ./configure --enable-mongodb-developer-flags -# configure relies on version information in libmongoc-version-current, but the target is not available until after calling configure -# To work around this, run the make target, then run configure again -if [ -n "$LIBMONGOC_VERSION" ]; then - make libmongoc-version-current - ./configure --enable-mongodb-developer-flags -fi - make test TESTS="tests/smoketest.phpt" diff --git a/.evergreen/config.yml b/.evergreen/config.yml index ebf197f4c..4e4a696a5 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -29,7 +29,7 @@ post: github_pr_aliases: &github_pr_aliases # Always test all builds for consistency - variant_tags: ["pr build"] - task_tags: ["pr"] + task_tags: ["pr !build-libmongoc"] # Run all tasks in PR variants for PHP 8.3 (excluding MongoDB latest) - variant_tags: ["pr php8.3"] task_tags: ["!latest"] @@ -74,5 +74,6 @@ include: - filename: .evergreen/config/generated/test/ocsp.yml - filename: .evergreen/config/generated/test/require-api-version.yml - filename: .evergreen/config/generated/test/skip-crypt-shared.yml - - filename: .evergreen/config/generated/test-variant/full.yml + - filename: .evergreen/config/generated/test-variant/modern-php-full.yml + - filename: .evergreen/config/generated/test-variant/legacy-php-full.yml - filename: .evergreen/config/generated/test-variant/libmongoc.yml diff --git a/.evergreen/config/build-variants.yml b/.evergreen/config/build-variants.yml index fb0e81113..d6ac2e051 100644 --- a/.evergreen/config/build-variants.yml +++ b/.evergreen/config/build-variants.yml @@ -3,13 +3,19 @@ # buildvariants: # Debian + - name: build-debian12 + display_name: "Build: Debian 12" + tags: ["build", "debian", "x64", "pr", "tag"] + run_on: debian12-small + tasks: + - name: "build-php-openssl3" + - name: "build-php-libmongoc" - name: build-debian11 display_name: "Build: Debian 11" tags: ["build", "debian", "x64", "pr", "tag"] run_on: debian11-small tasks: - name: "build-all-php" - - name: "build-php-libmongoc" - name: build-debian10 display_name: "Build: Debian 10" tags: ["build", "debian", "x64", "pr", "tag"] diff --git a/.evergreen/config/functions.yml b/.evergreen/config/functions.yml index 538abdea0..f7022296a 100644 --- a/.evergreen/config/functions.yml +++ b/.evergreen/config/functions.yml @@ -210,7 +210,6 @@ functions: params: include_expansions_in_env: - API_VERSION - - ATLAS_CONNECTIVITY_URIS - CRYPT_SHARED_LIB_PATH - MONGODB_URI - APPEND_URI diff --git a/.evergreen/config/generate-config.php b/.evergreen/config/generate-config.php index d4c084438..b6d999c58 100644 --- a/.evergreen/config/generate-config.php +++ b/.evergreen/config/generate-config.php @@ -2,25 +2,28 @@ = 5.0, < 8.0 + - name: test-debian11-php-8.0 + tags: ["test", "debian", "x64", "php8.0", "pr", "tag"] + display_name: "Test: Debian 11, PHP 8.0" + run_on: debian11-small + expansions: + FETCH_BUILD_VARIANT: "build-debian11" + FETCH_BUILD_TASK: "build-php-8.0" + depends_on: + - variant: "build-debian11" + name: "build-php-8.0" + tasks: + # Remember to add new major versions here as they are released + - ".standalone .local !.4.0 !.4.2 !.4.4 !.8.0" + - ".replicaset .local !.4.0 !.4.2 !.4.4 !.8.0" + - ".sharded .local !.4.0 !.4.2 !.4.4 !.8.0" + - ".loadbalanced .local !.4.0 !.4.2 !.4.4 !.8.0" + - ".ocsp !.4.4 !.8.0" + - "test-atlas-connectivity" + display_tasks: + - name: "test-ocsp-latest" + execution_tasks: + - ".ocsp .latest" + - name: "test-ocsp-rapid" + execution_tasks: + - ".ocsp .rapid" + - name: "test-ocsp-7.0" + execution_tasks: + - ".ocsp .7.0" + - name: "test-ocsp-6.0" + execution_tasks: + - ".ocsp .6.0" + - name: "test-ocsp-5.0" + execution_tasks: + - ".ocsp .5.0" + + # Test versions < 5.0 + - name: test-debian92-php-8.0 + tags: ["test", "debian", "x64", "php8.0", "pr", "tag"] + display_name: "Test: Debian 9.2, PHP 8.0" + run_on: debian92-small + expansions: + FETCH_BUILD_VARIANT: "build-debian92" + FETCH_BUILD_TASK: "build-php-8.0" + depends_on: + - variant: "build-debian92" + name: "build-php-8.0" + tasks: + # Remember to add new major versions here as they are released + - ".standalone .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + - ".replicaset .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + - ".sharded .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + - ".loadbalanced .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + - ".ocsp !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + display_tasks: + - name: "test-ocsp-4.4" + execution_tasks: + - ".ocsp .4.4" + # TODO PHPC-2343: This file can be removed when requiring PHP 8.1+ + # Test MongoDB >= 5.0, < 8.0 + - name: test-debian11-php-7.4 + tags: ["test", "debian", "x64", "php7.4", "pr", "tag"] + display_name: "Test: Debian 11, PHP 7.4" + run_on: debian11-small + expansions: + FETCH_BUILD_VARIANT: "build-debian11" + FETCH_BUILD_TASK: "build-php-7.4" + depends_on: + - variant: "build-debian11" + name: "build-php-7.4" + tasks: + # Remember to add new major versions here as they are released + - ".standalone .local !.4.0 !.4.2 !.4.4 !.8.0" + - ".replicaset .local !.4.0 !.4.2 !.4.4 !.8.0" + - ".sharded .local !.4.0 !.4.2 !.4.4 !.8.0" + - ".loadbalanced .local !.4.0 !.4.2 !.4.4 !.8.0" + - ".ocsp !.4.4 !.8.0" + - "test-atlas-connectivity" + display_tasks: + - name: "test-ocsp-latest" + execution_tasks: + - ".ocsp .latest" + - name: "test-ocsp-rapid" + execution_tasks: + - ".ocsp .rapid" + - name: "test-ocsp-7.0" + execution_tasks: + - ".ocsp .7.0" + - name: "test-ocsp-6.0" + execution_tasks: + - ".ocsp .6.0" + - name: "test-ocsp-5.0" + execution_tasks: + - ".ocsp .5.0" + + # Test versions < 5.0 + - name: test-debian92-php-7.4 + tags: ["test", "debian", "x64", "php7.4", "pr", "tag"] + display_name: "Test: Debian 9.2, PHP 7.4" + run_on: debian92-small + expansions: + FETCH_BUILD_VARIANT: "build-debian92" + FETCH_BUILD_TASK: "build-php-7.4" + depends_on: + - variant: "build-debian92" + name: "build-php-7.4" + tasks: + # Remember to add new major versions here as they are released + - ".standalone .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + - ".replicaset .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + - ".sharded .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + - ".loadbalanced .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + - ".ocsp !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + display_tasks: + - name: "test-ocsp-4.4" + execution_tasks: + - ".ocsp .4.4" diff --git a/.evergreen/config/generated/test-variant/libmongoc.yml b/.evergreen/config/generated/test-variant/libmongoc.yml index fb6688fd1..85b41e617 100644 --- a/.evergreen/config/generated/test-variant/libmongoc.yml +++ b/.evergreen/config/generated/test-variant/libmongoc.yml @@ -1,23 +1,23 @@ # This file is generated automatically - please edit the "templates/test-variant/libmongoc.yml" template file instead. buildvariants: # Variants with different libmongoc - - name: test-debian11-php-8.3-libmongoc-lowest-supported - display_name: "Test: Debian 11, PHP 8.3, libmongoc lowest" + - name: test-debian12-php-8.3-libmongoc-lowest-supported tags: ["test", "libmongoc", "debian", "x64", "php8.3", "pr", "tag"] - run_on: debian11-small + display_name: "Test: Debian 12, PHP 8.3, libmongoc lowest" + run_on: debian12-small expansions: - FETCH_BUILD_VARIANT: "build-debian11" + FETCH_BUILD_VARIANT: "build-debian12" FETCH_BUILD_TASK: "build-php-8.3-libmongoc-lowest-supported" depends_on: - - variant: "build-debian11" + - variant: "build-debian12" name: "build-php-8.3-libmongoc-lowest-supported" tasks: - - ".standalone .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - - ".replicaset .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - - ".sharded .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - - ".loadbalanced .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" + - ".standalone .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".replicaset .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".sharded .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".loadbalanced .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" - "test-atlas-connectivity" - - ".ocsp !.4.4 !.5.0" + - ".ocsp !.4.4 !.5.0 !.6.0" display_tasks: - name: "test-ocsp-latest" execution_tasks: @@ -25,30 +25,30 @@ buildvariants: - name: "test-ocsp-rapid" execution_tasks: - ".ocsp .rapid" + - name: "test-ocsp-8.0" + execution_tasks: + - ".ocsp .8.0" - name: "test-ocsp-7.0" execution_tasks: - ".ocsp .7.0" - - name: "test-ocsp-6.0" - execution_tasks: - - ".ocsp .6.0" - - name: test-debian11-php-8.3-libmongoc-next-stable - display_name: "Test: Debian 11, PHP 8.3, libmongoc next stable" + - name: test-debian12-php-8.3-libmongoc-next-stable tags: ["test", "libmongoc", "debian", "x64", "php8.3", "pr", "tag"] - run_on: debian11-small + display_name: "Test: Debian 12, PHP 8.3, libmongoc next stable" + run_on: debian12-small expansions: - FETCH_BUILD_VARIANT: "build-debian11" + FETCH_BUILD_VARIANT: "build-debian12" FETCH_BUILD_TASK: "build-php-8.3-libmongoc-next-stable" depends_on: - - variant: "build-debian11" + - variant: "build-debian12" name: "build-php-8.3-libmongoc-next-stable" tasks: - - ".standalone .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - - ".replicaset .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - - ".sharded .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - - ".loadbalanced .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" + - ".standalone .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".replicaset .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".sharded .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".loadbalanced .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" - "test-atlas-connectivity" - - ".ocsp !.4.4 !.5.0" + - ".ocsp !.4.4 !.5.0 !.6.0" display_tasks: - name: "test-ocsp-latest" execution_tasks: @@ -56,30 +56,30 @@ buildvariants: - name: "test-ocsp-rapid" execution_tasks: - ".ocsp .rapid" + - name: "test-ocsp-8.0" + execution_tasks: + - ".ocsp .8.0" - name: "test-ocsp-7.0" execution_tasks: - ".ocsp .7.0" - - name: "test-ocsp-6.0" - execution_tasks: - - ".ocsp .6.0" - - name: test-debian11-php-8.3-libmongoc-latest + - name: test-debian12-php-8.3-libmongoc-latest tags: ["test", "libmongoc", "debian", "x64", "php8.3"] - display_name: "Test: Debian 11, PHP 8.3, libmongoc latest" - run_on: debian11-small + display_name: "Test: Debian 12, PHP 8.3, libmongoc latest" + run_on: debian12-small expansions: - FETCH_BUILD_VARIANT: "build-debian11" + FETCH_BUILD_VARIANT: "build-debian12" FETCH_BUILD_TASK: "build-php-8.3-libmongoc-latest" depends_on: - - variant: "build-debian11" + - variant: "build-debian12" name: "build-php-8.3-libmongoc-latest" tasks: - - ".standalone .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - - ".replicaset .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - - ".sharded .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - - ".loadbalanced .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" + - ".standalone .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".replicaset .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".sharded .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".loadbalanced .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" - "test-atlas-connectivity" - - ".ocsp !.4.4 !.5.0" + - ".ocsp !.4.4 !.5.0 !.6.0" display_tasks: - name: "test-ocsp-latest" execution_tasks: @@ -87,9 +87,9 @@ buildvariants: - name: "test-ocsp-rapid" execution_tasks: - ".ocsp .rapid" + - name: "test-ocsp-8.0" + execution_tasks: + - ".ocsp .8.0" - name: "test-ocsp-7.0" execution_tasks: - ".ocsp .7.0" - - name: "test-ocsp-6.0" - execution_tasks: - - ".ocsp .6.0" diff --git a/.evergreen/config/generated/test-variant/modern-php-full.yml b/.evergreen/config/generated/test-variant/modern-php-full.yml new file mode 100644 index 000000000..8ee3d8be1 --- /dev/null +++ b/.evergreen/config/generated/test-variant/modern-php-full.yml @@ -0,0 +1,242 @@ +# This file is generated automatically - please edit the "templates/test-variant/modern-php-full.yml" template file instead. +buildvariants: + # Test MongoDB >= 7.0 + - name: test-debian12-php-8.3 + tags: ["test", "debian", "x64", "php8.3", "pr", "tag"] + display_name: "Test: Debian 12, PHP 8.3" + run_on: debian12-small + expansions: + FETCH_BUILD_VARIANT: "build-debian12" + FETCH_BUILD_TASK: "build-php-8.3" + depends_on: + - variant: "build-debian12" + name: "build-php-8.3" + tasks: + - ".standalone .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".replicaset .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".sharded .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".loadbalanced .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".ocsp !.4.4 !.5.0 !.6.0" + - "test-atlas-connectivity" + display_tasks: + - name: "test-ocsp-latest" + execution_tasks: + - ".ocsp .latest" + - name: "test-ocsp-rapid" + execution_tasks: + - ".ocsp .rapid" + - name: "test-ocsp-8.0" + execution_tasks: + - ".ocsp .8.0" + - name: "test-ocsp-7.0" + execution_tasks: + - ".ocsp .7.0" + + # Test MongoDB 5.0 and 6.0 + - name: test-debian11-php-8.3 + tags: ["test", "debian", "x64", "php8.3", "pr", "tag"] + display_name: "Test: Debian 11, PHP 8.3" + run_on: debian11-small + expansions: + FETCH_BUILD_VARIANT: "build-debian11" + FETCH_BUILD_TASK: "build-php-8.3" + depends_on: + - variant: "build-debian11" + name: "build-php-8.3" + tasks: + # Remember to add new major versions here as they are released + - ".standalone .local !.4.0 !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest" + - ".replicaset .local !.4.0 !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest" + - ".sharded .local !.4.0 !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest" + - ".loadbalanced .local !.4.0 !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest" + - ".ocsp !.4.4 !.7.0 !.8.0 !.rapid !.latest" + display_tasks: + - name: "test-ocsp-6.0" + execution_tasks: + - ".ocsp .6.0" + - name: "test-ocsp-5.0" + execution_tasks: + - ".ocsp .5.0" + + # Test versions < 5.0 + - name: test-debian92-php-8.3 + tags: ["test", "debian", "x64", "php8.3", "pr", "tag"] + display_name: "Test: Debian 9.2, PHP 8.3" + run_on: debian92-small + expansions: + FETCH_BUILD_VARIANT: "build-debian92" + FETCH_BUILD_TASK: "build-php-8.3" + depends_on: + - variant: "build-debian92" + name: "build-php-8.3" + tasks: + # Remember to add new major versions here as they are released + - ".standalone .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + - ".replicaset .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + - ".sharded .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + - ".loadbalanced .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + - ".ocsp !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + display_tasks: + - name: "test-ocsp-4.4" + execution_tasks: + - ".ocsp .4.4" + # Test MongoDB >= 7.0 + - name: test-debian12-php-8.2 + tags: ["test", "debian", "x64", "php8.2", "pr", "tag"] + display_name: "Test: Debian 12, PHP 8.2" + run_on: debian12-small + expansions: + FETCH_BUILD_VARIANT: "build-debian12" + FETCH_BUILD_TASK: "build-php-8.2" + depends_on: + - variant: "build-debian12" + name: "build-php-8.2" + tasks: + - ".standalone .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".replicaset .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".sharded .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".loadbalanced .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".ocsp !.4.4 !.5.0 !.6.0" + - "test-atlas-connectivity" + display_tasks: + - name: "test-ocsp-latest" + execution_tasks: + - ".ocsp .latest" + - name: "test-ocsp-rapid" + execution_tasks: + - ".ocsp .rapid" + - name: "test-ocsp-8.0" + execution_tasks: + - ".ocsp .8.0" + - name: "test-ocsp-7.0" + execution_tasks: + - ".ocsp .7.0" + + # Test MongoDB 5.0 and 6.0 + - name: test-debian11-php-8.2 + tags: ["test", "debian", "x64", "php8.2", "pr", "tag"] + display_name: "Test: Debian 11, PHP 8.2" + run_on: debian11-small + expansions: + FETCH_BUILD_VARIANT: "build-debian11" + FETCH_BUILD_TASK: "build-php-8.2" + depends_on: + - variant: "build-debian11" + name: "build-php-8.2" + tasks: + # Remember to add new major versions here as they are released + - ".standalone .local !.4.0 !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest" + - ".replicaset .local !.4.0 !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest" + - ".sharded .local !.4.0 !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest" + - ".loadbalanced .local !.4.0 !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest" + - ".ocsp !.4.4 !.7.0 !.8.0 !.rapid !.latest" + display_tasks: + - name: "test-ocsp-6.0" + execution_tasks: + - ".ocsp .6.0" + - name: "test-ocsp-5.0" + execution_tasks: + - ".ocsp .5.0" + + # Test versions < 5.0 + - name: test-debian92-php-8.2 + tags: ["test", "debian", "x64", "php8.2", "pr", "tag"] + display_name: "Test: Debian 9.2, PHP 8.2" + run_on: debian92-small + expansions: + FETCH_BUILD_VARIANT: "build-debian92" + FETCH_BUILD_TASK: "build-php-8.2" + depends_on: + - variant: "build-debian92" + name: "build-php-8.2" + tasks: + # Remember to add new major versions here as they are released + - ".standalone .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + - ".replicaset .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + - ".sharded .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + - ".loadbalanced .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + - ".ocsp !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + display_tasks: + - name: "test-ocsp-4.4" + execution_tasks: + - ".ocsp .4.4" + # Test MongoDB >= 7.0 + - name: test-debian12-php-8.1 + tags: ["test", "debian", "x64", "php8.1", "pr", "tag"] + display_name: "Test: Debian 12, PHP 8.1" + run_on: debian12-small + expansions: + FETCH_BUILD_VARIANT: "build-debian12" + FETCH_BUILD_TASK: "build-php-8.1" + depends_on: + - variant: "build-debian12" + name: "build-php-8.1" + tasks: + - ".standalone .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".replicaset .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".sharded .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".loadbalanced .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".ocsp !.4.4 !.5.0 !.6.0" + - "test-atlas-connectivity" + display_tasks: + - name: "test-ocsp-latest" + execution_tasks: + - ".ocsp .latest" + - name: "test-ocsp-rapid" + execution_tasks: + - ".ocsp .rapid" + - name: "test-ocsp-8.0" + execution_tasks: + - ".ocsp .8.0" + - name: "test-ocsp-7.0" + execution_tasks: + - ".ocsp .7.0" + + # Test MongoDB 5.0 and 6.0 + - name: test-debian11-php-8.1 + tags: ["test", "debian", "x64", "php8.1", "pr", "tag"] + display_name: "Test: Debian 11, PHP 8.1" + run_on: debian11-small + expansions: + FETCH_BUILD_VARIANT: "build-debian11" + FETCH_BUILD_TASK: "build-php-8.1" + depends_on: + - variant: "build-debian11" + name: "build-php-8.1" + tasks: + # Remember to add new major versions here as they are released + - ".standalone .local !.4.0 !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest" + - ".replicaset .local !.4.0 !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest" + - ".sharded .local !.4.0 !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest" + - ".loadbalanced .local !.4.0 !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest" + - ".ocsp !.4.4 !.7.0 !.8.0 !.rapid !.latest" + display_tasks: + - name: "test-ocsp-6.0" + execution_tasks: + - ".ocsp .6.0" + - name: "test-ocsp-5.0" + execution_tasks: + - ".ocsp .5.0" + + # Test versions < 5.0 + - name: test-debian92-php-8.1 + tags: ["test", "debian", "x64", "php8.1", "pr", "tag"] + display_name: "Test: Debian 9.2, PHP 8.1" + run_on: debian92-small + expansions: + FETCH_BUILD_VARIANT: "build-debian92" + FETCH_BUILD_TASK: "build-php-8.1" + depends_on: + - variant: "build-debian92" + name: "build-php-8.1" + tasks: + # Remember to add new major versions here as they are released + - ".standalone .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + - ".replicaset .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + - ".sharded .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + - ".loadbalanced .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + - ".ocsp !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + display_tasks: + - name: "test-ocsp-4.4" + execution_tasks: + - ".ocsp .4.4" diff --git a/.evergreen/config/generated/test/load-balanced.yml b/.evergreen/config/generated/test/load-balanced.yml index b96c536c3..0ab6cdaae 100644 --- a/.evergreen/config/generated/test/load-balanced.yml +++ b/.evergreen/config/generated/test/load-balanced.yml @@ -28,6 +28,20 @@ tasks: vars: MONGODB_URI: "${SINGLE_MONGOS_LB_URI}" SSL: "yes" + - name: "test-mongodb-8.0-loadbalanced" + tags: ["loadbalanced", "local", "8.0", "tag"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "sharded_cluster" + MONGODB_VERSION: "8.0" + LOAD_BALANCER: "true" + SSL: "yes" + - func: "start load balancer" + - func: "run tests" + vars: + MONGODB_URI: "${SINGLE_MONGOS_LB_URI}" + SSL: "yes" - name: "test-mongodb-7.0-loadbalanced" tags: ["loadbalanced", "local", "7.0", "tag"] commands: diff --git a/.evergreen/config/generated/test/local.yml b/.evergreen/config/generated/test/local.yml index 2cd7ea243..bf8ba6562 100644 --- a/.evergreen/config/generated/test/local.yml +++ b/.evergreen/config/generated/test/local.yml @@ -116,6 +116,64 @@ tasks: TOPOLOGY: "sharded_cluster" MONGODB_VERSION: "rapid" - func: "run tests" + - name: "test-mongodb-8.0-standalone-noauth-nossl" + tags: ["standalone", "local", "8.0", "tag"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + MONGODB_VERSION: "8.0" + - func: "run tests" + + - name: "test-mongodb-8.0-standalone-auth" + tags: ["standalone", "local", "8.0", "auth", "tag"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + AUTH: "auth" + MONGODB_VERSION: "8.0" + - func: "run tests" + + - name: "test-mongodb-8.0-standalone-ssl" + tags: ["standalone", "local", "8.0", "ssl", "tag"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + SSL: "yes" + MONGODB_VERSION: "8.0" + - func: "run tests" + vars: + SSL: "yes" + + - name: "test-mongodb-8.0-replicaset-noauth-nossl" + tags: ["replicaset", "local", "8.0", "tag"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + MONGODB_VERSION: "8.0" + - func: "run tests" + + - name: "test-mongodb-8.0-replicaset-auth" + tags: ["replicaset", "local", "8.0", "auth", "pr", "tag"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + AUTH: "auth" + MONGODB_VERSION: "8.0" + - func: "run tests" + + - name: "test-mongodb-8.0-sharded-noauth-nossl" + tags: ["sharded", "local", "8.0", "tag"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "sharded_cluster" + MONGODB_VERSION: "8.0" + - func: "run tests" - name: "test-mongodb-7.0-standalone-noauth-nossl" tags: ["standalone", "local", "7.0", "tag"] commands: @@ -464,61 +522,3 @@ tasks: TOPOLOGY: "sharded_cluster" MONGODB_VERSION: "4.0" - func: "run tests" - - name: "test-mongodb-3.6-standalone-noauth-nossl" - tags: ["standalone", "local", "3.6", "tag"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - MONGODB_VERSION: "3.6" - - func: "run tests" - - - name: "test-mongodb-3.6-standalone-auth" - tags: ["standalone", "local", "3.6", "auth", "tag"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - AUTH: "auth" - MONGODB_VERSION: "3.6" - - func: "run tests" - - - name: "test-mongodb-3.6-standalone-ssl" - tags: ["standalone", "local", "3.6", "ssl", "tag"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "server" - SSL: "yes" - MONGODB_VERSION: "3.6" - - func: "run tests" - vars: - SSL: "yes" - - - name: "test-mongodb-3.6-replicaset-noauth-nossl" - tags: ["replicaset", "local", "3.6", "tag"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "replica_set" - MONGODB_VERSION: "3.6" - - func: "run tests" - - - name: "test-mongodb-3.6-replicaset-auth" - tags: ["replicaset", "local", "3.6", "auth", "pr", "tag"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "replica_set" - AUTH: "auth" - MONGODB_VERSION: "3.6" - - func: "run tests" - - - name: "test-mongodb-3.6-sharded-noauth-nossl" - tags: ["sharded", "local", "3.6", "tag"] - commands: - - func: "bootstrap mongo-orchestration" - vars: - TOPOLOGY: "sharded_cluster" - MONGODB_VERSION: "3.6" - - func: "run tests" diff --git a/.evergreen/config/generated/test/ocsp.yml b/.evergreen/config/generated/test/ocsp.yml index 298d5067a..9e001bc61 100644 --- a/.evergreen/config/generated/test/ocsp.yml +++ b/.evergreen/config/generated/test/ocsp.yml @@ -822,6 +822,417 @@ tasks: vars: TESTS: "tests/ocsp-failure.phpt" APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + - name: "ocsp-test_1-rsa-delegate-8.0" + tags: ["ocsp", "8.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_1" + CERT_TYPE: "rsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "8.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + + - name: "ocsp-test_1-ecdsa-delegate-8.0" + tags: ["ocsp", "8.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_1" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "8.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + + - name: "ocsp-test_1-rsa-nodelegate-8.0" + tags: ["ocsp", "8.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_1" + CERT_TYPE: "rsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "8.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + + - name: "ocsp-test_1-ecdsa-nodelegate-8.0" + tags: ["ocsp", "8.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_1" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "8.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + + - name: "ocsp-test_2-rsa-delegate-8.0" + tags: ["ocsp", "8.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_2" + CERT_TYPE: "rsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "8.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + + - name: "ocsp-test_2-ecdsa-delegate-8.0" + tags: ["ocsp", "8.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_2" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "8.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + + - name: "ocsp-test_2-rsa-nodelegate-8.0" + tags: ["ocsp", "8.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_2" + CERT_TYPE: "rsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "8.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + + - name: "ocsp-test_2-ecdsa-nodelegate-8.0" + tags: ["ocsp", "8.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_2" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "8.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + + - name: "ocsp-test_3-rsa-delegate-8.0" + tags: ["ocsp", "8.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_3" + CERT_TYPE: "rsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "8.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + + - name: "ocsp-test_3-ecdsa-delegate-8.0" + tags: ["ocsp", "8.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_3" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "8.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + + - name: "ocsp-test_3-rsa-nodelegate-8.0" + tags: ["ocsp", "8.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_3" + CERT_TYPE: "rsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "8.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + + - name: "ocsp-test_3-ecdsa-nodelegate-8.0" + tags: ["ocsp", "8.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_3" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "8.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + + - name: "ocsp-test_4-rsa-delegate-8.0" + tags: ["ocsp", "8.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_4" + CERT_TYPE: "rsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "8.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + + - name: "ocsp-test_4-ecdsa-delegate-8.0" + tags: ["ocsp", "8.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_4" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "8.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + + - name: "ocsp-test_4-rsa-nodelegate-8.0" + tags: ["ocsp", "8.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_4" + CERT_TYPE: "rsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "8.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + + - name: "ocsp-test_4-ecdsa-nodelegate-8.0" + tags: ["ocsp", "8.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "TEST_4" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "8.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + + - name: "ocsp-soft_fail_test-rsa-8.0" + tags: ["ocsp", "8.0"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "8.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + + - name: "ocsp-soft_fail_test-ecdsa-8.0" + tags: ["ocsp", "8.0"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "8.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-success.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + + - name: "ocsp-malicious_server_test_1-rsa-delegate-8.0" + tags: ["ocsp", "8.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "MALICIOUS_SERVER_TEST_1" + CERT_TYPE: "rsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "8.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + + - name: "ocsp-malicious_server_test_1-ecdsa-delegate-8.0" + tags: ["ocsp", "8.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "MALICIOUS_SERVER_TEST_1" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "on" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "8.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + + - name: "ocsp-malicious_server_test_1-rsa-nodelegate-8.0" + tags: ["ocsp", "8.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "MALICIOUS_SERVER_TEST_1" + CERT_TYPE: "rsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "8.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + + - name: "ocsp-malicious_server_test_1-ecdsa-nodelegate-8.0" + tags: ["ocsp", "8.0"] + commands: + - func: "run OCSP responder" + vars: + TEST_COLUMN: "MALICIOUS_SERVER_TEST_1" + CERT_TYPE: "ecdsa" + USE_DELEGATE: "off" + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "8.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" + + - name: "ocsp-malicious_server_test_2-rsa-8.0" + tags: ["ocsp", "8.0"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "8.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "rsa-basic-tls-ocsp-mustStaple-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/rsa/ca.pem" + + - name: "ocsp-malicious_server_test_2-ecdsa-8.0" + tags: ["ocsp", "8.0"] + commands: + - func: "bootstrap mongo-orchestration" + vars: + MONGODB_VERSION: "8.0" + TOPOLOGY: "server" + ORCHESTRATION_FILE: "ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json" + - func: "run tests" + vars: + TESTS: "tests/ocsp-failure.phpt" + APPEND_URI: "/?tls=true&tlsCAFile=${DRIVERS_TOOLS}/.evergreen/ocsp/ecdsa/ca.pem" - name: "ocsp-test_1-rsa-delegate-7.0" tags: ["ocsp", "7.0"] commands: diff --git a/.evergreen/config/generated/test/require-api-version.yml b/.evergreen/config/generated/test/require-api-version.yml index 490cac73a..1b7c80fcb 100644 --- a/.evergreen/config/generated/test/require-api-version.yml +++ b/.evergreen/config/generated/test/require-api-version.yml @@ -24,6 +24,18 @@ tasks: - func: "run tests" vars: API_VERSION: "1" + - name: "test-requireApiVersion-8.0" + tags: [ "standalone", "local", "8.0", "versioned_api", "tag" ] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "server" + AUTH: "auth" + REQUIRE_API_VERSION: "yes" + MONGODB_VERSION: "8.0" + - func: "run tests" + vars: + API_VERSION: "1" - name: "test-requireApiVersion-7.0" tags: [ "standalone", "local", "7.0", "versioned_api", "tag" ] commands: diff --git a/.evergreen/config/generated/test/skip-crypt-shared.yml b/.evergreen/config/generated/test/skip-crypt-shared.yml index 7a2f50e5a..62091941d 100644 --- a/.evergreen/config/generated/test/skip-crypt-shared.yml +++ b/.evergreen/config/generated/test/skip-crypt-shared.yml @@ -20,6 +20,16 @@ tasks: - func: "run tests" vars: SKIP_CRYPT_SHARED: "yes" + - name: "test-skip_crypt_shared-8.0" + tags: [ "replicaset", "local", "8.0", "skip_crypt_shared" ] + commands: + - func: "bootstrap mongo-orchestration" + vars: + TOPOLOGY: "replica_set" + MONGODB_VERSION: "8.0" + - func: "run tests" + vars: + SKIP_CRYPT_SHARED: "yes" - name: "test-skip_crypt_shared-7.0" tags: [ "replicaset", "local", "7.0", "skip_crypt_shared" ] commands: diff --git a/.evergreen/config/templates/build/build-libmongoc.yml b/.evergreen/config/templates/build/build-libmongoc.yml index 3a32b2f89..f90007132 100644 --- a/.evergreen/config/templates/build/build-libmongoc.yml +++ b/.evergreen/config/templates/build/build-libmongoc.yml @@ -10,7 +10,8 @@ - func: "compile driver" vars: PHP_VERSION: "%phpVersion%" - LIBMONGOC_VERSION: "1.27.4" + # TODO: Change to "1.28.0" once 1.28.0 is released + LIBMONGOC_VERSION: "master" - func: "upload build" - name: "build-php-%phpVersion%-libmongoc-next-stable" @@ -19,7 +20,8 @@ - func: "compile driver" vars: PHP_VERSION: "%phpVersion%" - LIBMONGOC_VERSION: "r1.27" + # TODO: Change to "r1.28" once 1.28.0 is released + LIBMONGOC_VERSION: "master" - func: "upload build" - name: "build-php-%phpVersion%-libmongoc-latest" diff --git a/.evergreen/config/templates/test-variant/full.yml b/.evergreen/config/templates/test-variant/legacy-php-full.yml similarity index 65% rename from .evergreen/config/templates/test-variant/full.yml rename to .evergreen/config/templates/test-variant/legacy-php-full.yml index d0ac5da66..4fa23f7db 100644 --- a/.evergreen/config/templates/test-variant/full.yml +++ b/.evergreen/config/templates/test-variant/legacy-php-full.yml @@ -1,3 +1,5 @@ + # TODO PHPC-2343: This file can be removed when requiring PHP 8.1+ + # Test MongoDB >= 5.0, < 8.0 - name: test-debian11-php-%phpVersion% tags: ["test", "debian", "x64", "php%phpVersion%", "pr", "tag"] display_name: "Test: Debian 11, PHP %phpVersion%" @@ -9,12 +11,13 @@ - variant: "build-debian11" name: "build-php-%phpVersion%" tasks: - - ".standalone .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - - ".replicaset .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - - ".sharded .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - - ".loadbalanced .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" + # Remember to add new major versions here as they are released + - ".standalone .local !.4.0 !.4.2 !.4.4 !.8.0" + - ".replicaset .local !.4.0 !.4.2 !.4.4 !.8.0" + - ".sharded .local !.4.0 !.4.2 !.4.4 !.8.0" + - ".loadbalanced .local !.4.0 !.4.2 !.4.4 !.8.0" + - ".ocsp !.4.4 !.8.0" - "test-atlas-connectivity" - - ".ocsp !.4.4 !.5.0" display_tasks: - name: "test-ocsp-latest" execution_tasks: @@ -28,7 +31,11 @@ - name: "test-ocsp-6.0" execution_tasks: - ".ocsp .6.0" + - name: "test-ocsp-5.0" + execution_tasks: + - ".ocsp .5.0" + # Test versions < 5.0 - name: test-debian92-php-%phpVersion% tags: ["test", "debian", "x64", "php%phpVersion%", "pr", "tag"] display_name: "Test: Debian 9.2, PHP %phpVersion%" @@ -41,15 +48,12 @@ name: "build-php-%phpVersion%" tasks: # Remember to add new major versions here as they are released - - ".standalone .local !.6.0 !.7.0 !.rapid !.latest" - - ".replicaset .local !.6.0 !.7.0 !.rapid !.latest" - - ".sharded .local !.6.0 !.7.0 !.rapid !.latest" - - ".loadbalanced .local !.6.0 !.7.0 !.rapid !.latest" - - ".ocsp !.6.0 !.7.0 !.rapid !.latest" + - ".standalone .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + - ".replicaset .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + - ".sharded .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + - ".loadbalanced .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + - ".ocsp !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" display_tasks: - - name: "test-ocsp-5.0" - execution_tasks: - - ".ocsp .5.0" - name: "test-ocsp-4.4" execution_tasks: - ".ocsp .4.4" diff --git a/.evergreen/config/templates/test-variant/libmongoc.yml b/.evergreen/config/templates/test-variant/libmongoc.yml index a0bc2711b..90099c6bf 100644 --- a/.evergreen/config/templates/test-variant/libmongoc.yml +++ b/.evergreen/config/templates/test-variant/libmongoc.yml @@ -1,21 +1,21 @@ # Variants with different libmongoc - - name: test-debian11-php-%phpVersion%-libmongoc-lowest-supported - display_name: "Test: Debian 11, PHP %phpVersion%, libmongoc lowest" + - name: test-debian12-php-%phpVersion%-libmongoc-lowest-supported tags: ["test", "libmongoc", "debian", "x64", "php%phpVersion%", "pr", "tag"] - run_on: debian11-small + display_name: "Test: Debian 12, PHP %phpVersion%, libmongoc lowest" + run_on: debian12-small expansions: - FETCH_BUILD_VARIANT: "build-debian11" + FETCH_BUILD_VARIANT: "build-debian12" FETCH_BUILD_TASK: "build-php-%phpVersion%-libmongoc-lowest-supported" depends_on: - - variant: "build-debian11" + - variant: "build-debian12" name: "build-php-%phpVersion%-libmongoc-lowest-supported" tasks: - - ".standalone .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - - ".replicaset .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - - ".sharded .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - - ".loadbalanced .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" + - ".standalone .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".replicaset .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".sharded .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".loadbalanced .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" - "test-atlas-connectivity" - - ".ocsp !.4.4 !.5.0" + - ".ocsp !.4.4 !.5.0 !.6.0" display_tasks: - name: "test-ocsp-latest" execution_tasks: @@ -23,30 +23,30 @@ - name: "test-ocsp-rapid" execution_tasks: - ".ocsp .rapid" + - name: "test-ocsp-8.0" + execution_tasks: + - ".ocsp .8.0" - name: "test-ocsp-7.0" execution_tasks: - ".ocsp .7.0" - - name: "test-ocsp-6.0" - execution_tasks: - - ".ocsp .6.0" - - name: test-debian11-php-%phpVersion%-libmongoc-next-stable - display_name: "Test: Debian 11, PHP %phpVersion%, libmongoc next stable" + - name: test-debian12-php-%phpVersion%-libmongoc-next-stable tags: ["test", "libmongoc", "debian", "x64", "php%phpVersion%", "pr", "tag"] - run_on: debian11-small + display_name: "Test: Debian 12, PHP %phpVersion%, libmongoc next stable" + run_on: debian12-small expansions: - FETCH_BUILD_VARIANT: "build-debian11" + FETCH_BUILD_VARIANT: "build-debian12" FETCH_BUILD_TASK: "build-php-%phpVersion%-libmongoc-next-stable" depends_on: - - variant: "build-debian11" + - variant: "build-debian12" name: "build-php-%phpVersion%-libmongoc-next-stable" tasks: - - ".standalone .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - - ".replicaset .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - - ".sharded .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - - ".loadbalanced .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" + - ".standalone .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".replicaset .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".sharded .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".loadbalanced .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" - "test-atlas-connectivity" - - ".ocsp !.4.4 !.5.0" + - ".ocsp !.4.4 !.5.0 !.6.0" display_tasks: - name: "test-ocsp-latest" execution_tasks: @@ -54,30 +54,30 @@ - name: "test-ocsp-rapid" execution_tasks: - ".ocsp .rapid" + - name: "test-ocsp-8.0" + execution_tasks: + - ".ocsp .8.0" - name: "test-ocsp-7.0" execution_tasks: - ".ocsp .7.0" - - name: "test-ocsp-6.0" - execution_tasks: - - ".ocsp .6.0" - - name: test-debian11-php-%phpVersion%-libmongoc-latest + - name: test-debian12-php-%phpVersion%-libmongoc-latest tags: ["test", "libmongoc", "debian", "x64", "php%phpVersion%"] - display_name: "Test: Debian 11, PHP %phpVersion%, libmongoc latest" - run_on: debian11-small + display_name: "Test: Debian 12, PHP %phpVersion%, libmongoc latest" + run_on: debian12-small expansions: - FETCH_BUILD_VARIANT: "build-debian11" + FETCH_BUILD_VARIANT: "build-debian12" FETCH_BUILD_TASK: "build-php-%phpVersion%-libmongoc-latest" depends_on: - - variant: "build-debian11" + - variant: "build-debian12" name: "build-php-%phpVersion%-libmongoc-latest" tasks: - - ".standalone .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - - ".replicaset .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - - ".sharded .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" - - ".loadbalanced .local !.3.6 !.4.0 !.4.2 !.4.4 !.5.0" + - ".standalone .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".replicaset .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".sharded .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".loadbalanced .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" - "test-atlas-connectivity" - - ".ocsp !.4.4 !.5.0" + - ".ocsp !.4.4 !.5.0 !.6.0" display_tasks: - name: "test-ocsp-latest" execution_tasks: @@ -85,9 +85,9 @@ - name: "test-ocsp-rapid" execution_tasks: - ".ocsp .rapid" + - name: "test-ocsp-8.0" + execution_tasks: + - ".ocsp .8.0" - name: "test-ocsp-7.0" execution_tasks: - ".ocsp .7.0" - - name: "test-ocsp-6.0" - execution_tasks: - - ".ocsp .6.0" diff --git a/.evergreen/config/templates/test-variant/modern-php-full.yml b/.evergreen/config/templates/test-variant/modern-php-full.yml new file mode 100644 index 000000000..8d925f5cf --- /dev/null +++ b/.evergreen/config/templates/test-variant/modern-php-full.yml @@ -0,0 +1,80 @@ + # Test MongoDB >= 7.0 + - name: test-debian12-php-%phpVersion% + tags: ["test", "debian", "x64", "php%phpVersion%", "pr", "tag"] + display_name: "Test: Debian 12, PHP %phpVersion%" + run_on: debian12-small + expansions: + FETCH_BUILD_VARIANT: "build-debian12" + FETCH_BUILD_TASK: "build-php-%phpVersion%" + depends_on: + - variant: "build-debian12" + name: "build-php-%phpVersion%" + tasks: + - ".standalone .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".replicaset .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".sharded .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".loadbalanced .local !.4.0 !.4.2 !.4.4 !.5.0 !.6.0" + - ".ocsp !.4.4 !.5.0 !.6.0" + - "test-atlas-connectivity" + display_tasks: + - name: "test-ocsp-latest" + execution_tasks: + - ".ocsp .latest" + - name: "test-ocsp-rapid" + execution_tasks: + - ".ocsp .rapid" + - name: "test-ocsp-8.0" + execution_tasks: + - ".ocsp .8.0" + - name: "test-ocsp-7.0" + execution_tasks: + - ".ocsp .7.0" + + # Test MongoDB 5.0 and 6.0 + - name: test-debian11-php-%phpVersion% + tags: ["test", "debian", "x64", "php%phpVersion%", "pr", "tag"] + display_name: "Test: Debian 11, PHP %phpVersion%" + run_on: debian11-small + expansions: + FETCH_BUILD_VARIANT: "build-debian11" + FETCH_BUILD_TASK: "build-php-%phpVersion%" + depends_on: + - variant: "build-debian11" + name: "build-php-%phpVersion%" + tasks: + # Remember to add new major versions here as they are released + - ".standalone .local !.4.0 !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest" + - ".replicaset .local !.4.0 !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest" + - ".sharded .local !.4.0 !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest" + - ".loadbalanced .local !.4.0 !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest" + - ".ocsp !.4.4 !.7.0 !.8.0 !.rapid !.latest" + display_tasks: + - name: "test-ocsp-6.0" + execution_tasks: + - ".ocsp .6.0" + - name: "test-ocsp-5.0" + execution_tasks: + - ".ocsp .5.0" + + # Test versions < 5.0 + - name: test-debian92-php-%phpVersion% + tags: ["test", "debian", "x64", "php%phpVersion%", "pr", "tag"] + display_name: "Test: Debian 9.2, PHP %phpVersion%" + run_on: debian92-small + expansions: + FETCH_BUILD_VARIANT: "build-debian92" + FETCH_BUILD_TASK: "build-php-%phpVersion%" + depends_on: + - variant: "build-debian92" + name: "build-php-%phpVersion%" + tasks: + # Remember to add new major versions here as they are released + - ".standalone .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + - ".replicaset .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + - ".sharded .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + - ".loadbalanced .local !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + - ".ocsp !.5.0 !.6.0 !.7.0 !.8.0 !.rapid !.latest" + display_tasks: + - name: "test-ocsp-4.4" + execution_tasks: + - ".ocsp .4.4" diff --git a/.evergreen/config/test-tasks.yml b/.evergreen/config/test-tasks.yml index 2fe1acca4..99cd3a210 100644 --- a/.evergreen/config/test-tasks.yml +++ b/.evergreen/config/test-tasks.yml @@ -2,6 +2,14 @@ tasks: - name: "test-atlas-connectivity" tags: ["atlas", "nodb", "pr", "tag"] commands: + # This creates secrets-export.sh, which is later sourced by run-tests.sh + - command: subprocess.exec + params: + working_dir: "src" + binary: bash + args: + - -c + - ${DRIVERS_TOOLS}/.evergreen/secrets_handling/setup-secrets.sh drivers/atlas_connect - func: "run tests" vars: TESTS: "tests/atlas.phpt" diff --git a/.evergreen/run-tests.sh b/.evergreen/run-tests.sh index 8a7524027..05e50000d 100755 --- a/.evergreen/run-tests.sh +++ b/.evergreen/run-tests.sh @@ -39,6 +39,11 @@ else echo "crypt_shared library will be loaded from path: $CRYPT_SHARED_LIB_PATH" fi +# Conditionally source setup-secrets.sh created by drivers-evergreen-tools +if [ -f "${PROJECT_DIRECTORY}/secrets-export.sh" ]; then + source ${PROJECT_DIRECTORY}/secrets-export.sh +fi + echo "Running tests with URI: $MONGODB_URI" # Run the tests, and store the results in a junit result file diff --git a/.github/actions/windows/prepare-build/action.yml b/.github/actions/windows/prepare-build/action.yml index 153c44bfa..1ef49a17c 100644 --- a/.github/actions/windows/prepare-build/action.yml +++ b/.github/actions/windows/prepare-build/action.yml @@ -31,7 +31,7 @@ runs: - name: Setup PHP SDK id: setup-php - uses: php/setup-php-sdk@v0.8 + uses: php/setup-php-sdk@v0.9 with: version: ${{ inputs.version }} arch: ${{ inputs.arch }} diff --git a/.github/workflows/package-release.yml b/.github/workflows/package-release.yml index c78b48cc2..b1c67a2ae 100644 --- a/.github/workflows/package-release.yml +++ b/.github/workflows/package-release.yml @@ -97,7 +97,7 @@ jobs: strategy: fail-fast: false matrix: - # Note: keep this in sync with the Windows matrix in windows-tests.yml - php: [ "7.4", "8.0", "8.1", "8.2", "8.3" ] + # Note: keep this in sync with the Windows matrix in tests.yml + php: [ "7.4", "8.0", "8.1", "8.2", "8.3", "8.4" ] arch: [ x64, x86 ] ts: [ ts, nts ] diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 3818abfc9..654d40c91 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -28,6 +28,7 @@ jobs: - "8.1" - "8.2" - "8.3" + - "8.4" mongodb-version: - "4.4" topology: @@ -110,3 +111,19 @@ jobs: - name: "Install release archive to verify correctness" run: sudo pecl install ${{ env.PACKAGE_FILE }} + + test-windows: + name: "Windows Tests" + uses: ./.github/workflows/windows-tests.yml + with: + php: ${{ matrix.php }} + arch: ${{ matrix.arch }} + ts: ${{ matrix.ts }} + secrets: inherit + strategy: + fail-fast: false + matrix: + # Note: keep this in sync with the Windows matrix in package-release.yml + php: [ "7.4", "8.0", "8.1", "8.2", "8.3", "8.4" ] + arch: [ x64, x86 ] + ts: [ ts, nts ] diff --git a/.github/workflows/windows-tests.yml b/.github/workflows/windows-tests.yml index ea2021f14..b1e6dd544 100644 --- a/.github/workflows/windows-tests.yml +++ b/.github/workflows/windows-tests.yml @@ -1,33 +1,34 @@ name: "Windows Tests" +run-name: "Windows Tests (PHP ${{ inputs.php }} ${{ inputs.arch }} ${{ inputs.ts }})" on: - pull_request: - branches: - - "v*.*" - - "master" - - "feature/*" - push: - branches: - - "v*.*" - - "master" - - "feature/*" + workflow_call: + inputs: + php: + description: "The PHP version to build for" + type: string + required: true + arch: + description: "The architecture to build for (x64 or x86)" + type: string + required: true + ts: + description: "Thread safety (ts or nts)" + type: string + required: true + upload_release_asset: + description: "Whether to upload a release asset" + type: boolean + default: false jobs: build: - name: "Build Windows DLLs" + name: "Build Driver" runs-on: windows-2022 defaults: run: shell: cmd - strategy: - # This matrix intentionally uses fail-fast: false to ensure other builds are finished - fail-fast: false - matrix: - php: [ "7.4", "8.0", "8.1", "8.2", "8.3" ] - arch: [ x64, x86 ] - ts: [ ts, nts ] - steps: - uses: actions/checkout@v4 with: @@ -37,70 +38,61 @@ jobs: id: build-driver uses: ./.github/actions/windows/build with: - version: ${{ matrix.php }} - arch: ${{ matrix.arch }} - ts: ${{ matrix.ts }} + version: ${{ inputs.php }} + arch: ${{ inputs.arch }} + ts: ${{ inputs.ts }} - name: Cache build artifacts for subsequent builds id: cache-build-artifacts uses: actions/cache/save@v4 with: - key: ${{ github.sha }}-${{ matrix.php }}-${{ matrix.ts }}-${{ matrix.arch }} + key: ${{ github.sha }}-${{ inputs.php }}-${{ inputs.ts }}-${{ inputs.arch }} path: | ${{ steps.build-driver.outputs.build-dir }}\php_mongodb.dll ${{ steps.build-driver.outputs.build-dir }}\php_mongodb.pdb test: - name: "Windows Tests" + name: "Run Tests" runs-on: windows-2022 needs: build defaults: run: shell: cmd - strategy: - # Timeouts starting the MongoDB service are common and should not - # interrupt the overall test matrix. - fail-fast: false - matrix: - php: [ "7.4", "8.0", "8.1", "8.2", "8.3" ] - arch: [ x64, x86 ] - ts: [ ts, nts ] - steps: - uses: actions/checkout@v4 with: submodules: true + - id: setup-mongodb + uses: mongodb-labs/drivers-evergreen-tools@master + with: + version: "7.0" + topology: "server" + - name: Prepare build environment id: prepare-build uses: ./.github/actions/windows/prepare-build with: - version: ${{ matrix.php }} - arch: ${{ matrix.arch }} - ts: ${{ matrix.ts }} + version: ${{ inputs.php }} + arch: ${{ inputs.arch }} + ts: ${{ inputs.ts }} - name: Restore cached build artifacts id: cache-build-artifacts uses: actions/cache/restore@v4 with: fail-on-cache-miss: true - key: ${{ github.sha }}-${{ matrix.php }}-${{ matrix.ts }}-${{ matrix.arch }} + key: ${{ github.sha }}-${{ inputs.php }}-${{ inputs.ts }}-${{ inputs.arch }} path: | ${{ steps.prepare-build.outputs.build-dir }}\php_mongodb.dll ${{ steps.prepare-build.outputs.build-dir }}\php_mongodb.pdb - - name: Start MongoDB - run: | - sc config MongoDB start= auto - sc start MongoDB - - - name: Wait until MongoDB is available - run: .github/workflows/wait-for-mongodb.bat - - name: Run Tests run: nmake /nologo test env: NO_INTERACTION: 1 REPORT_EXIT_STATUS: 1 TESTS: --show-diff + MONGODB_URI: ${{ steps.setup-mongodb.outputs.cluster-uri }} + CRYPT_SHARED_LIB_PATH: ${{ steps.setup-mongodb.outputs.crypt-shared-lib-path }} diff --git a/.gitignore b/.gitignore index 4c7863182..c5b9a6b81 100644 --- a/.gitignore +++ b/.gitignore @@ -68,5 +68,8 @@ mongodb-*tgz # Coverage files coverage* +# drivers-evergreen-tools secrets handling +secrets-export.sh + # temporary purls file /purls.txt diff --git a/config.m4 b/config.m4 index b4e16c8fa..28e8ddae6 100644 --- a/config.m4 +++ b/config.m4 @@ -276,7 +276,7 @@ if test "$PHP_MONGODB" != "no"; then PHP_MONGODB_MONGOCRYPT_VERSION_STRING="None" if test "$PHP_MONGODB_SYSTEM_LIBS" != "no"; then - PKG_CHECK_MODULES([PHP_MONGODB_BSON], [libbson-1.0 >= 1.27.4], [ + PKG_CHECK_MODULES([PHP_MONGODB_BSON], [libbson-1.0 >= 1.28.0], [ PHP_MONGODB_BSON_VERSION=`$PKG_CONFIG libbson-1.0 --modversion` PHP_MONGODB_BSON_VERSION_STRING="System ($PHP_MONGODB_BSON_VERSION)" @@ -284,10 +284,10 @@ if test "$PHP_MONGODB" != "no"; then PHP_EVAL_LIBLINE($PHP_MONGODB_BSON_LIBS, MONGODB_SHARED_LIBADD) AC_DEFINE(HAVE_SYSTEM_LIBBSON, 1, [Use system libbson]) ],[ - AC_MSG_ERROR([Could not find system library for libbson >= 1.27.4]) + AC_MSG_ERROR([Could not find system library for libbson >= 1.28.0]) ]) - PKG_CHECK_MODULES([PHP_MONGODB_MONGOC], [libmongoc-1.0 >= 1.27.4], [ + PKG_CHECK_MODULES([PHP_MONGODB_MONGOC], [libmongoc-1.0 >= 1.28.0], [ PHP_MONGODB_BSON_VERSION=`$PKG_CONFIG libbson-1.0 --modversion` PHP_MONGODB_BSON_VERSION_STRING="System ($PHP_MONGODB_BSON_VERSION)" @@ -295,11 +295,11 @@ if test "$PHP_MONGODB" != "no"; then PHP_EVAL_LIBLINE($PHP_MONGODB_MONGOC_LIBS, MONGODB_SHARED_LIBADD) AC_DEFINE(HAVE_SYSTEM_LIBMONGOC, 1, [Use system libmongoc]) ],[ - AC_MSG_ERROR(Could not find system library for libmongoc >= 1.27.4) + AC_MSG_ERROR(Could not find system library for libmongoc >= 1.28.0) ]) if test "$PHP_MONGODB_CLIENT_SIDE_ENCRYPTION" != "no"; then - PKG_CHECK_MODULES([PHP_MONGODB_MONGOCRYPT], [libmongocrypt >= 1.10.1], [ + PKG_CHECK_MODULES([PHP_MONGODB_MONGOCRYPT], [libmongocrypt >= 1.11.0], [ PHP_MONGODB_MONGOCRYPT_VERSION=`$PKG_CONFIG libmongocrypt --modversion` PHP_MONGODB_MONGOCRYPT_VERSION_STRING="System ($PHP_MONGODB_MONGOCRYPT_VERSION)" @@ -307,7 +307,7 @@ if test "$PHP_MONGODB" != "no"; then PHP_EVAL_LIBLINE($PHP_MONGODB_MONGOCRYPT_LIBS, MONGODB_SHARED_LIBADD) AC_DEFINE(HAVE_SYSTEM_LIBMONGOCRYPT, 1, [Use system libmongocrypt]) ],[ - AC_MSG_ERROR(Could not find system library for libmongocrypt >= 1.10.1) + AC_MSG_ERROR(Could not find system library for libmongocrypt >= 1.11.0) ]) fi fi @@ -364,7 +364,6 @@ if test "$PHP_MONGODB" != "no"; then PHP_MONGODB_BSON_VERSION_STRING="Bundled ($libbson_VERSION_FULL)" PHP_MONGODB_MONGOC_VERSION_STRING="Bundled ($libmongoc_VERSION_FULL)" - PHP_MONGODB_MONGOCRYPT_VERSION_STRING="Bundled ($MONGOCRYPT_BUILD_VERSION)" AC_SUBST(BSON_EXTRA_ALIGN, 0) AC_SUBST(BSON_OS, 1) @@ -399,7 +398,7 @@ if test "$PHP_MONGODB" != "no"; then PHP_MONGODB_KMS_MESSAGE_SOURCES="hexlify.c kms_azure_request.c kms_b64.c kms_caller_identity_request.c kms_crypto_apple.c kms_crypto_libcrypto.c kms_crypto_none.c kms_crypto_windows.c kms_decrypt_request.c kms_encrypt_request.c kms_gcp_request.c kms_kmip_reader_writer.c kms_kmip_request.c kms_kmip_response.c kms_kmip_response_parser.c kms_kv_list.c kms_message.c kms_port.c kms_request.c kms_request_opt.c kms_request_str.c kms_response.c kms_response_parser.c sort.c" PHP_MONGODB_BSON_SOURCES="bcon.c bson-atomic.c bson.c bson-clock.c bson-context.c bson-decimal128.c bson-error.c bson-iso8601.c bson-iter.c bson-json.c bson-keys.c bson-md5.c bson-memory.c bson-oid.c bson-reader.c bson-string.c bson-timegm.c bson-utf8.c bson-value.c bson-version-functions.c bson-writer.c" PHP_MONGODB_JSONSL_SOURCES="jsonsl.c" - PHP_MONGODB_MONGOC_SOURCES="mcd-azure.c mcd-nsinfo.c mcd-rpc.c mongoc-aggregate.c mongoc-apm.c mongoc-array.c mongoc-async.c mongoc-async-cmd.c mongoc-buffer.c mongoc-bulk-operation.c mongoc-change-stream.c mongoc-client.c mongoc-client-pool.c mongoc-client-session.c mongoc-client-side-encryption.c mongoc-cluster-aws.c mongoc-cluster.c mongoc-cluster-cyrus.c mongoc-cluster-sasl.c mongoc-cluster-sspi.c mongoc-cmd.c mongoc-collection.c mongoc-compression.c mongoc-counters.c mongoc-crypt.c mongoc-crypto.c mongoc-crypto-cng.c mongoc-crypto-common-crypto.c mongoc-crypto-openssl.c mongoc-cursor-array.c mongoc-cursor.c mongoc-cursor-change-stream.c mongoc-cursor-cmd.c mongoc-cursor-cmd-deprecated.c mongoc-cursor-find.c mongoc-cursor-find-cmd.c mongoc-cursor-find-opquery.c mongoc-cursor-legacy.c mongoc-cyrus.c mongoc-database.c mongoc-deprioritized-servers.c mongoc-error.c mongoc-find-and-modify.c mongoc-flags.c mongoc-generation-map.c mongoc-gridfs-bucket.c mongoc-gridfs-bucket-file.c mongoc-gridfs.c mongoc-gridfs-file.c mongoc-gridfs-file-list.c mongoc-gridfs-file-page.c mongoc-handshake.c mongoc-host-list.c mongoc-http.c mongoc-index.c mongoc-init.c mongoc-interrupt.c mongoc-libressl.c mongoc-linux-distro-scanner.c mongoc-list.c mongoc-log.c mongoc-matcher.c mongoc-matcher-op.c mongoc-memcmp.c mongoc-ocsp-cache.c mongoc-opcode.c mongoc-openssl.c mongoc-optional.c mongoc-opts.c mongoc-opts-helpers.c mongoc-queue.c mongoc-rand-cng.c mongoc-rand-common-crypto.c mongoc-rand-openssl.c mongoc-read-concern.c mongoc-read-prefs.c mongoc-rpc.c mongoc-sasl.c mongoc-scram.c mongoc-secure-channel.c mongoc-secure-transport.c mongoc-server-api.c mongoc-server-description.c mongoc-server-monitor.c mongoc-server-stream.c mongoc-set.c mongoc-shared.c mongoc-socket.c mongoc-ssl.c mongoc-sspi.c mongoc-stream-buffered.c mongoc-stream.c mongoc-stream-file.c mongoc-stream-gridfs.c mongoc-stream-gridfs-download.c mongoc-stream-gridfs-upload.c mongoc-stream-socket.c mongoc-stream-tls.c mongoc-stream-tls-libressl.c mongoc-stream-tls-openssl-bio.c mongoc-stream-tls-openssl.c mongoc-stream-tls-secure-channel.c mongoc-stream-tls-secure-transport.c mongoc-timeout.c mongoc-topology-background-monitoring.c mongoc-topology.c mongoc-topology-description-apm.c mongoc-topology-description.c mongoc-topology-scanner.c mongoc-ts-pool.c mongoc-uri.c mongoc-util.c mongoc-version-functions.c mongoc-write-command.c mongoc-write-concern.c service-gcp.c" + PHP_MONGODB_MONGOC_SOURCES="mcd-azure.c mcd-nsinfo.c mcd-rpc.c mongoc-aggregate.c mongoc-apm.c mongoc-array.c mongoc-async.c mongoc-async-cmd.c mongoc-buffer.c mongoc-bulk-operation.c mongoc-bulkwrite.c mongoc-change-stream.c mongoc-client.c mongoc-client-pool.c mongoc-client-session.c mongoc-client-side-encryption.c mongoc-cluster-aws.c mongoc-cluster.c mongoc-cluster-cyrus.c mongoc-cluster-sasl.c mongoc-cluster-sspi.c mongoc-cmd.c mongoc-collection.c mongoc-compression.c mongoc-counters.c mongoc-crypt.c mongoc-crypto.c mongoc-crypto-cng.c mongoc-crypto-common-crypto.c mongoc-crypto-openssl.c mongoc-cursor-array.c mongoc-cursor.c mongoc-cursor-change-stream.c mongoc-cursor-cmd.c mongoc-cursor-cmd-deprecated.c mongoc-cursor-find.c mongoc-cursor-find-cmd.c mongoc-cursor-find-opquery.c mongoc-cursor-legacy.c mongoc-cyrus.c mongoc-database.c mongoc-deprioritized-servers.c mongoc-error.c mongoc-find-and-modify.c mongoc-flags.c mongoc-generation-map.c mongoc-gridfs-bucket.c mongoc-gridfs-bucket-file.c mongoc-gridfs.c mongoc-gridfs-file.c mongoc-gridfs-file-list.c mongoc-gridfs-file-page.c mongoc-handshake.c mongoc-host-list.c mongoc-http.c mongoc-index.c mongoc-init.c mongoc-interrupt.c mongoc-libressl.c mongoc-linux-distro-scanner.c mongoc-list.c mongoc-log.c mongoc-matcher.c mongoc-matcher-op.c mongoc-memcmp.c mongoc-ocsp-cache.c mongoc-opcode.c mongoc-openssl.c mongoc-optional.c mongoc-opts.c mongoc-opts-helpers.c mongoc-queue.c mongoc-rand-cng.c mongoc-rand-common-crypto.c mongoc-rand-openssl.c mongoc-read-concern.c mongoc-read-prefs.c mongoc-rpc.c mongoc-sasl.c mongoc-scram.c mongoc-secure-channel.c mongoc-secure-transport.c mongoc-server-api.c mongoc-server-description.c mongoc-server-monitor.c mongoc-server-stream.c mongoc-set.c mongoc-shared.c mongoc-socket.c mongoc-ssl.c mongoc-sspi.c mongoc-stream-buffered.c mongoc-stream.c mongoc-stream-file.c mongoc-stream-gridfs.c mongoc-stream-gridfs-download.c mongoc-stream-gridfs-upload.c mongoc-stream-socket.c mongoc-stream-tls.c mongoc-stream-tls-libressl.c mongoc-stream-tls-openssl-bio.c mongoc-stream-tls-openssl.c mongoc-stream-tls-secure-channel.c mongoc-stream-tls-secure-transport.c mongoc-timeout.c mongoc-topology-background-monitoring.c mongoc-topology.c mongoc-topology-description-apm.c mongoc-topology-description.c mongoc-topology-scanner.c mongoc-ts-pool.c mongoc-uri.c mongoc-util.c mongoc-version-functions.c mongoc-write-command.c mongoc-write-concern.c service-gcp.c" PHP_MONGODB_UTF8PROC_SOURCES="utf8proc.c" PHP_MONGODB_ZLIB_SOURCES="adler32.c compress.c crc32.c deflate.c gzclose.c gzlib.c gzread.c gzwrite.c infback.c inffast.c inflate.c inftrees.c trees.c uncompr.c zutil.c" @@ -457,6 +456,8 @@ if test "$PHP_MONGODB" != "no"; then if test "$PHP_MONGODB_CLIENT_SIDE_ENCRYPTION" = "yes"; then PHP_MONGODB_LIBMONGOCRYPT_CFLAGS="$PHP_MONGODB_BUNDLED_CFLAGS $PHP_MONGODB_LIBMONGOCRYPT_CFLAGS -DKMS_MSG_STATIC -DMLIB_USER" + PHP_MONGODB_MONGOCRYPT_VERSION_STRING="Bundled ($MONGOCRYPT_BUILD_VERSION)" + dnl Since libmongocrypt adds kms-message, we can enable AWS auth in this case AC_SUBST(MONGOC_ENABLE_MONGODB_AWS_AUTH, 1) AC_SUBST(MONGOCRYPT_ENABLE_TRACE, 1) diff --git a/config.w32 b/config.w32 index bb46052fc..db80390f8 100644 --- a/config.w32 +++ b/config.w32 @@ -119,7 +119,7 @@ if (PHP_MONGODB != "no") { var PHP_MONGODB_KMS_MESSAGE_SOURCES="hexlify.c kms_azure_request.c kms_b64.c kms_caller_identity_request.c kms_crypto_apple.c kms_crypto_libcrypto.c kms_crypto_none.c kms_crypto_windows.c kms_decrypt_request.c kms_encrypt_request.c kms_gcp_request.c kms_kmip_reader_writer.c kms_kmip_request.c kms_kmip_response.c kms_kmip_response_parser.c kms_kv_list.c kms_message.c kms_port.c kms_request.c kms_request_opt.c kms_request_str.c kms_response.c kms_response_parser.c sort.c"; var PHP_MONGODB_BSON_SOURCES="bcon.c bson-atomic.c bson.c bson-clock.c bson-context.c bson-decimal128.c bson-error.c bson-iso8601.c bson-iter.c bson-json.c bson-keys.c bson-md5.c bson-memory.c bson-oid.c bson-reader.c bson-string.c bson-timegm.c bson-utf8.c bson-value.c bson-version-functions.c bson-writer.c"; var PHP_MONGODB_JSONSL_SOURCES="jsonsl.c"; - var PHP_MONGODB_MONGOC_SOURCES="mcd-azure.c mcd-nsinfo.c mcd-rpc.c mongoc-aggregate.c mongoc-apm.c mongoc-array.c mongoc-async.c mongoc-async-cmd.c mongoc-buffer.c mongoc-bulk-operation.c mongoc-change-stream.c mongoc-client.c mongoc-client-pool.c mongoc-client-session.c mongoc-client-side-encryption.c mongoc-cluster-aws.c mongoc-cluster.c mongoc-cluster-cyrus.c mongoc-cluster-sasl.c mongoc-cluster-sspi.c mongoc-cmd.c mongoc-collection.c mongoc-compression.c mongoc-counters.c mongoc-crypt.c mongoc-crypto.c mongoc-crypto-cng.c mongoc-crypto-common-crypto.c mongoc-crypto-openssl.c mongoc-cursor-array.c mongoc-cursor.c mongoc-cursor-change-stream.c mongoc-cursor-cmd.c mongoc-cursor-cmd-deprecated.c mongoc-cursor-find.c mongoc-cursor-find-cmd.c mongoc-cursor-find-opquery.c mongoc-cursor-legacy.c mongoc-cyrus.c mongoc-database.c mongoc-deprioritized-servers.c mongoc-error.c mongoc-find-and-modify.c mongoc-flags.c mongoc-generation-map.c mongoc-gridfs-bucket.c mongoc-gridfs-bucket-file.c mongoc-gridfs.c mongoc-gridfs-file.c mongoc-gridfs-file-list.c mongoc-gridfs-file-page.c mongoc-handshake.c mongoc-host-list.c mongoc-http.c mongoc-index.c mongoc-init.c mongoc-interrupt.c mongoc-libressl.c mongoc-linux-distro-scanner.c mongoc-list.c mongoc-log.c mongoc-matcher.c mongoc-matcher-op.c mongoc-memcmp.c mongoc-ocsp-cache.c mongoc-opcode.c mongoc-openssl.c mongoc-optional.c mongoc-opts.c mongoc-opts-helpers.c mongoc-queue.c mongoc-rand-cng.c mongoc-rand-common-crypto.c mongoc-rand-openssl.c mongoc-read-concern.c mongoc-read-prefs.c mongoc-rpc.c mongoc-sasl.c mongoc-scram.c mongoc-secure-channel.c mongoc-secure-transport.c mongoc-server-api.c mongoc-server-description.c mongoc-server-monitor.c mongoc-server-stream.c mongoc-set.c mongoc-shared.c mongoc-socket.c mongoc-ssl.c mongoc-sspi.c mongoc-stream-buffered.c mongoc-stream.c mongoc-stream-file.c mongoc-stream-gridfs.c mongoc-stream-gridfs-download.c mongoc-stream-gridfs-upload.c mongoc-stream-socket.c mongoc-stream-tls.c mongoc-stream-tls-libressl.c mongoc-stream-tls-openssl-bio.c mongoc-stream-tls-openssl.c mongoc-stream-tls-secure-channel.c mongoc-stream-tls-secure-transport.c mongoc-timeout.c mongoc-topology-background-monitoring.c mongoc-topology.c mongoc-topology-description-apm.c mongoc-topology-description.c mongoc-topology-scanner.c mongoc-ts-pool.c mongoc-uri.c mongoc-util.c mongoc-version-functions.c mongoc-write-command.c mongoc-write-concern.c service-gcp.c"; + var PHP_MONGODB_MONGOC_SOURCES="mcd-azure.c mcd-nsinfo.c mcd-rpc.c mongoc-aggregate.c mongoc-apm.c mongoc-array.c mongoc-async.c mongoc-async-cmd.c mongoc-buffer.c mongoc-bulk-operation.c mongoc-bulkwrite.c mongoc-change-stream.c mongoc-client.c mongoc-client-pool.c mongoc-client-session.c mongoc-client-side-encryption.c mongoc-cluster-aws.c mongoc-cluster.c mongoc-cluster-cyrus.c mongoc-cluster-sasl.c mongoc-cluster-sspi.c mongoc-cmd.c mongoc-collection.c mongoc-compression.c mongoc-counters.c mongoc-crypt.c mongoc-crypto.c mongoc-crypto-cng.c mongoc-crypto-common-crypto.c mongoc-crypto-openssl.c mongoc-cursor-array.c mongoc-cursor.c mongoc-cursor-change-stream.c mongoc-cursor-cmd.c mongoc-cursor-cmd-deprecated.c mongoc-cursor-find.c mongoc-cursor-find-cmd.c mongoc-cursor-find-opquery.c mongoc-cursor-legacy.c mongoc-cyrus.c mongoc-database.c mongoc-deprioritized-servers.c mongoc-error.c mongoc-find-and-modify.c mongoc-flags.c mongoc-generation-map.c mongoc-gridfs-bucket.c mongoc-gridfs-bucket-file.c mongoc-gridfs.c mongoc-gridfs-file.c mongoc-gridfs-file-list.c mongoc-gridfs-file-page.c mongoc-handshake.c mongoc-host-list.c mongoc-http.c mongoc-index.c mongoc-init.c mongoc-interrupt.c mongoc-libressl.c mongoc-linux-distro-scanner.c mongoc-list.c mongoc-log.c mongoc-matcher.c mongoc-matcher-op.c mongoc-memcmp.c mongoc-ocsp-cache.c mongoc-opcode.c mongoc-openssl.c mongoc-optional.c mongoc-opts.c mongoc-opts-helpers.c mongoc-queue.c mongoc-rand-cng.c mongoc-rand-common-crypto.c mongoc-rand-openssl.c mongoc-read-concern.c mongoc-read-prefs.c mongoc-rpc.c mongoc-sasl.c mongoc-scram.c mongoc-secure-channel.c mongoc-secure-transport.c mongoc-server-api.c mongoc-server-description.c mongoc-server-monitor.c mongoc-server-stream.c mongoc-set.c mongoc-shared.c mongoc-socket.c mongoc-ssl.c mongoc-sspi.c mongoc-stream-buffered.c mongoc-stream.c mongoc-stream-file.c mongoc-stream-gridfs.c mongoc-stream-gridfs-download.c mongoc-stream-gridfs-upload.c mongoc-stream-socket.c mongoc-stream-tls.c mongoc-stream-tls-libressl.c mongoc-stream-tls-openssl-bio.c mongoc-stream-tls-openssl.c mongoc-stream-tls-secure-channel.c mongoc-stream-tls-secure-transport.c mongoc-timeout.c mongoc-topology-background-monitoring.c mongoc-topology.c mongoc-topology-description-apm.c mongoc-topology-description.c mongoc-topology-scanner.c mongoc-ts-pool.c mongoc-uri.c mongoc-util.c mongoc-version-functions.c mongoc-write-command.c mongoc-write-concern.c service-gcp.c"; var PHP_MONGODB_UTF8PROC_SOURCES="utf8proc.c"; EXTENSION("mongodb", "php_phongo.c", null, PHP_MONGODB_CFLAGS); @@ -177,6 +177,7 @@ if (PHP_MONGODB != "no") { // TODO: Support building with Secure Channel on Windows MONGOC_ENABLE_SSL_SECURE_CHANNEL: 0, MONGOC_ENABLE_CRYPTO_CNG: 0, + MONGOC_HAVE_BCRYPT_PBKDF2: 0, // Secure Transport does not apply to Windows MONGOC_ENABLE_SSL_SECURE_TRANSPORT: 0, MONGOC_ENABLE_CRYPTO_COMMON_CRYPTO: 0, diff --git a/phongo_version.h b/phongo_version.h index 9904e1285..7356ba077 100644 --- a/phongo_version.h +++ b/phongo_version.h @@ -22,9 +22,9 @@ * publishing a release. */ /* clang-format off */ -#define PHP_MONGODB_VERSION "1.19.4dev" +#define PHP_MONGODB_VERSION "1.20.0dev" #define PHP_MONGODB_STABILITY "devel" -#define PHP_MONGODB_VERSION_DESC 1,19,4,0 +#define PHP_MONGODB_VERSION_DESC 1,20,0,0 /* clang-format on */ #endif /* PHONGO_VERSION_H */ diff --git a/sbom.json b/sbom.json index 64c7ebdee..efb69683b 100644 --- a/sbom.json +++ b/sbom.json @@ -19,22 +19,22 @@ "version": "1.10.1" }, { - "bom-ref": "pkg:github/mongodb/mongo-c-driver@1.27.4", + "bom-ref": "pkg:github/mongodb/mongo-c-driver@1.27.2", "externalReferences": [ { "type": "distribution", - "url": "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/1.27.4.tar.gz" + "url": "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/1.27.2.tar.gz" }, { "type": "website", - "url": "https://github.com/mongodb/mongo-c-driver/tree/1.27.4" + "url": "https://github.com/mongodb/mongo-c-driver/tree/1.27.2" } ], "group": "mongodb", "name": "mongo-c-driver", - "purl": "pkg:github/mongodb/mongo-c-driver@1.27.4", + "purl": "pkg:github/mongodb/mongo-c-driver@1.27.2", "type": "library", - "version": "1.27.4" + "version": "1.27.2" } ], "dependencies": [ @@ -42,7 +42,7 @@ "ref": "pkg:github/mongodb/libmongocrypt@1.10.1" }, { - "ref": "pkg:github/mongodb/mongo-c-driver@1.27.4" + "ref": "pkg:github/mongodb/mongo-c-driver@1.27.2" } ], "metadata": { diff --git a/scripts/autotools/libmongoc/CheckSSL.m4 b/scripts/autotools/libmongoc/CheckSSL.m4 index 5ec9c8d11..faf1190b2 100644 --- a/scripts/autotools/libmongoc/CheckSSL.m4 +++ b/scripts/autotools/libmongoc/CheckSSL.m4 @@ -186,6 +186,7 @@ AC_MSG_RESULT([$PHP_MONGODB_SSL]) dnl Disable Windows SSL and crypto AC_SUBST(MONGOC_ENABLE_SSL_SECURE_CHANNEL, 0) AC_SUBST(MONGOC_ENABLE_CRYPTO_CNG, 0) +AC_SUBST(MONGOC_HAVE_BCRYPT_PBKDF2, 0) if test "$PHP_MONGODB_SSL" = "openssl" -o "$PHP_MONGODB_SSL" = "libressl" -o "$PHP_MONGODB_SSL" = "darwin"; then AC_SUBST(MONGOC_ENABLE_SSL, 1) diff --git a/scripts/convert-bson-corpus-tests.php b/scripts/convert-bson-corpus-tests.php index 669bf1b09..84a2dad57 100644 --- a/scripts/convert-bson-corpus-tests.php +++ b/scripts/convert-bson-corpus-tests.php @@ -3,12 +3,8 @@ require_once __DIR__ . '/../tests/utils/basic.inc'; $expectedFailures = [ - 'Int64 type: -1' => 'PHP encodes integers as 32-bit if range allows', - 'Int64 type: 0' => 'PHP encodes integers as 32-bit if range allows', - 'Int64 type: 1' => 'PHP encodes integers as 32-bit if range allows', 'Javascript Code: Embedded nulls' => 'Embedded null in code string is not supported in libbson (CDRIVER-1879)', 'Javascript Code with Scope: Unicode and embedded null in code string, empty scope' => 'Embedded null in code string is not supported in libbson (CDRIVER-1879)', - 'Multiple types within the same document: All BSON types' => 'PHP encodes integers as 32-bit if range allows', 'Top-level document validity: Bad $date (number, not string or hash)' => 'Legacy extended JSON $date syntax uses numbers (CDRIVER-2223)', ]; @@ -147,64 +143,36 @@ function getParamsForValid(array $test, array $case) $code .= sprintf('$convertedExtJson = %s;', var_export($convertedExtJson, true)) . "\n"; } - $code .= "\n// Canonical BSON -> Native -> Canonical BSON\n"; - $code .= 'echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n";' . "\n"; - $expect .= $expectedCanonicalBson . "\n"; - $code .= "\n// Canonical BSON -> BSON object -> Canonical BSON\n"; $code .= 'echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n";' . "\n"; $expect .= $expectedCanonicalBson . "\n"; - $code .= "\n// Canonical BSON -> Canonical extJSON\n"; - $code .= 'echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n";' . "\n"; - $expect .= $expectedCanonicalExtJson . "\n"; - $code .= "\n// Canonical BSON -> BSON object -> Canonical extJSON\n"; $code .= 'echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n";' . "\n"; $expect .= $expectedCanonicalExtJson . "\n"; if (isset($relaxedExtJson)) { - $code .= "\n// Canonical BSON -> Relaxed extJSON\n"; - $code .= 'echo json_canonicalize(toRelaxedExtendedJSON($canonicalBson)), "\n";' . "\n"; - $expect .= $expectedRelaxedExtJson . "\n"; - $code .= "\n// Canonical BSON -> BSON object -> Relaxed extJSON\n"; $code .= 'echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toRelaxedExtendedJSON()), "\n";' . "\n"; $expect .= $expectedRelaxedExtJson . "\n"; } if (!$lossy) { - $code .= "\n// Canonical extJSON -> Canonical BSON\n"; - $code .= 'echo bin2hex(fromJSON($canonicalExtJson)), "\n";' . "\n"; - $expect .= $expectedCanonicalBson . "\n"; - $code .= "\n// Canonical extJSON -> BSON object -> Canonical BSON\n"; $code .= 'echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n";' . "\n"; $expect .= $expectedCanonicalBson . "\n"; } if (isset($degenerateBson)) { - $code .= "\n// Degenerate BSON -> Native -> Canonical BSON\n"; - $code .= 'echo bin2hex(fromPHP(toPHP($degenerateBson))), "\n";' . "\n"; - $expect .= $expectedCanonicalBson . "\n"; - $code .= "\n// Degenerate BSON -> BSON object -> Canonical BSON\n"; - $code .= 'echo bin2hex(fromPHP(MongoDB\BSON\Document::fromBSON($degenerateBson)->toPHP())), "\n";' . "\n"; + $code .= 'echo bin2hex((string) MongoDB\BSON\Document::fromPHP(MongoDB\BSON\Document::fromBSON($degenerateBson)->toPHP())), "\n";' . "\n"; $expect .= $expectedCanonicalBson . "\n"; - $code .= "\n// Degenerate BSON -> Canonical extJSON\n"; - $code .= 'echo json_canonicalize(toCanonicalExtendedJSON($degenerateBson)), "\n";' . "\n"; - $expect .= $expectedCanonicalExtJson . "\n"; - $code .= "\n// Degenerate BSON -> BSON object -> Canonical extJSON\n"; $code .= 'echo json_canonicalize(MongoDB\BSON\Document::fromBSON($degenerateBson)->toCanonicalExtendedJSON()), "\n";' . "\n"; $expect .= $expectedCanonicalExtJson . "\n"; if (isset($relaxedExtJson)) { - $code .= "\n// Degenerate BSON -> Relaxed extJSON\n"; - $code .= 'echo json_canonicalize(toRelaxedExtendedJSON($degenerateBson)), "\n";' . "\n"; - $expect .= $expectedRelaxedExtJson . "\n"; - $code .= "\n// Degenerate BSON -> BSON object -> Relaxed extJSON\n"; $code .= 'echo json_canonicalize(MongoDB\BSON\Document::fromBSON($degenerateBson)->toRelaxedExtendedJSON()), "\n";' . "\n"; $expect .= $expectedRelaxedExtJson . "\n"; @@ -212,20 +180,12 @@ function getParamsForValid(array $test, array $case) } if (isset($degenerateExtJson) && !$lossy) { - $code .= "\n// Degenerate extJSON -> Canonical BSON\n"; - $code .= 'echo bin2hex(fromJSON($degenerateExtJson)), "\n";' . "\n"; - $expect .= $expectedCanonicalBson . "\n"; - $code .= "\n// Degenerate extJSON -> BSON object -> Canonical BSON\n"; $code .= 'echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n";' . "\n"; $expect .= $expectedCanonicalBson . "\n"; } if (isset($relaxedExtJson)) { - $code .= "\n// Relaxed extJSON -> BSON -> Relaxed extJSON\n"; - $code .= 'echo json_canonicalize(toRelaxedExtendedJSON(fromJSON($relaxedExtJson))), "\n";' . "\n"; - $expect .= $expectedRelaxedExtJson . "\n"; - $code .= "\n// Relaxed extJSON -> BSON object -> Relaxed extJSON\n"; $code .= 'echo json_canonicalize(MongoDB\BSON\Document::fromJSON($relaxedExtJson)->toRelaxedExtendedJSON()), "\n";' . "\n"; $expect .= $expectedRelaxedExtJson . "\n"; @@ -248,7 +208,7 @@ function getParamsForDecodeError(array $test, array $case) $code = sprintf('$bson = hex2bin(%s);', var_export($case['bson'], true)) . "\n\n"; $code .= "throws(function() use (\$bson) {\n"; - $code .= " var_dump(toPHP(\$bson));\n"; + $code .= " MongoDB\\BSON\\Document::fromBSON(\$bson)->toPHP();\n"; $code .= "}, 'MongoDB\Driver\Exception\UnexpectedValueException');"; /* We do not test for the exception message, since that may differ based on @@ -277,7 +237,7 @@ function getParamsForParseError(array $test, array $case) case '0x00': // Top-level document case '0x05': // Binary $code = "throws(function() {\n"; - $code .= sprintf(" fromJSON(%s);\n", var_export($case['string'], true)); + $code .= sprintf(" MongoDB\\BSON\\Document::fromJSON(%s);\n", var_export($case['string'], true)); $code .= "}, 'MongoDB\Driver\Exception\UnexpectedValueException');"; /* We do not test for the exception message, since that may differ diff --git a/src/BSON/UTCDateTime.c b/src/BSON/UTCDateTime.c index 0bcb7eb24..8cb153f84 100644 --- a/src/BSON/UTCDateTime.c +++ b/src/BSON/UTCDateTime.c @@ -127,6 +127,38 @@ static HashTable* php_phongo_utcdatetime_get_properties_hash(phongo_compat_objec return props; } +static void php_phongo_utcdatetime_to_php_date(zval* return_value, const zval* this, zend_class_entry* ce) +{ + php_phongo_utcdatetime_t* intern; + php_date_obj* datetime_obj; + char* sec_str; + size_t sec_len; + int64_t sec, usec; + + intern = Z_UTCDATETIME_OBJ_P(this); + + object_init_ex(return_value, ce); + datetime_obj = Z_PHPDATE_P(return_value); + + sec = intern->milliseconds / 1000; + usec = (llabs(intern->milliseconds) % 1000) * 1000; + if (intern->milliseconds < 0 && usec != 0) { + /* For dates before the unix epoch, we need to subtract the microseconds from the timestamp. + * Since we can't directly pass microseconds when calling php_date_initialize due to a bug in PHP, + * we manually decrement the timestamp and subtract the number of microseconds from a full seconds + * to store in the us field. */ + sec--; + usec = 1000000 - usec; + } + + /* TODO PHP 8.1.7+: microseconds can be included in the format string */ + sec_len = spprintf(&sec_str, 0, "@%" PRId64, sec); + php_date_initialize(datetime_obj, sec_str, sec_len, NULL, NULL, 0); + efree(sec_str); + + datetime_obj->time->us = usec; +} + /* Construct a new BSON UTCDateTime type from either the current time, milliseconds since the epoch, or a DateTimeInterface object. Defaults to the current time. */ @@ -212,36 +244,17 @@ static PHP_METHOD(MongoDB_BSON_UTCDateTime, __toString) /* Returns a DateTime object representing this UTCDateTime */ static PHP_METHOD(MongoDB_BSON_UTCDateTime, toDateTime) { - php_phongo_utcdatetime_t* intern; - php_date_obj* datetime_obj; - char* sec_str; - size_t sec_len; - int64_t sec, usec; - - intern = Z_UTCDATETIME_OBJ_P(getThis()); - PHONGO_PARSE_PARAMETERS_NONE(); - object_init_ex(return_value, php_date_get_date_ce()); - datetime_obj = Z_PHPDATE_P(return_value); - - sec = intern->milliseconds / 1000; - usec = (llabs(intern->milliseconds) % 1000) * 1000; - if (intern->milliseconds < 0 && usec != 0) { - /* For dates before the unix epoch, we need to subtract the microseconds from the timestamp. - * Since we can't directly pass microseconds when calling php_date_initialize due to a bug in PHP, - * we manually decrement the timestamp and subtract the number of microseconds from a full seconds - * to store in the us field. */ - sec--; - usec = 1000000 - usec; - } + php_phongo_utcdatetime_to_php_date(return_value, getThis(), php_date_get_date_ce()); +} - /* TODO PHP 8.1.7+: microseconds can be included in the format string */ - sec_len = spprintf(&sec_str, 0, "@%" PRId64, sec); - php_date_initialize(datetime_obj, sec_str, sec_len, NULL, NULL, 0); - efree(sec_str); +/* Returns a DateTimeImmutable object representing this UTCDateTime */ +static PHP_METHOD(MongoDB_BSON_UTCDateTime, toDateTimeImmutable) +{ + PHONGO_PARSE_PARAMETERS_NONE(); - datetime_obj->time->us = usec; + php_phongo_utcdatetime_to_php_date(return_value, getThis(), php_date_get_immutable_ce()); } static PHP_METHOD(MongoDB_BSON_UTCDateTime, jsonSerialize) diff --git a/src/BSON/UTCDateTime.stub.php b/src/BSON/UTCDateTime.stub.php index d2aa3d80c..ac9143a33 100644 --- a/src/BSON/UTCDateTime.stub.php +++ b/src/BSON/UTCDateTime.stub.php @@ -18,6 +18,8 @@ final public function __construct($milliseconds = null) {} final public function toDateTime(): \DateTime {} + final public function toDateTimeImmutable(): \DateTimeImmutable {} + final public function __toString(): string {} final public static function __set_state(array $properties): UTCDateTime {} diff --git a/src/BSON/UTCDateTime_arginfo.h b/src/BSON/UTCDateTime_arginfo.h index 04fd59cd3..df008acda 100644 --- a/src/BSON/UTCDateTime_arginfo.h +++ b/src/BSON/UTCDateTime_arginfo.h @@ -1,5 +1,5 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: c4d05eaa04380f7a4adcb8f9c1562d7013c37121 */ + * Stub hash: 2b7ac84585a74a210af3cb2061541977cc309e2d */ #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_MongoDB_BSON_UTCDateTime___construct, 0, 0, 0) @@ -16,6 +16,9 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_MongoDB_BSON_UTCDateTime_toDateTime, 0, 0, DateTime, 0) ZEND_END_ARG_INFO() +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_MongoDB_BSON_UTCDateTime_toDateTimeImmutable, 0, 0, DateTimeImmutable, 0) +ZEND_END_ARG_INFO() + ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_MongoDB_BSON_UTCDateTime___toString, 0, 0, IS_STRING, 0) ZEND_END_ARG_INFO() @@ -62,6 +65,7 @@ static ZEND_METHOD(MongoDB_BSON_UTCDateTime, __construct); static ZEND_METHOD(MongoDB_BSON_UTCDateTime, __construct); #endif static ZEND_METHOD(MongoDB_BSON_UTCDateTime, toDateTime); +static ZEND_METHOD(MongoDB_BSON_UTCDateTime, toDateTimeImmutable); static ZEND_METHOD(MongoDB_BSON_UTCDateTime, __toString); static ZEND_METHOD(MongoDB_BSON_UTCDateTime, __set_state); static ZEND_METHOD(MongoDB_BSON_UTCDateTime, serialize); @@ -89,6 +93,7 @@ static const zend_function_entry class_MongoDB_BSON_UTCDateTime_methods[] = { ZEND_ME(MongoDB_BSON_UTCDateTime, __construct, arginfo_class_MongoDB_BSON_UTCDateTime___construct, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL) #endif ZEND_ME(MongoDB_BSON_UTCDateTime, toDateTime, arginfo_class_MongoDB_BSON_UTCDateTime_toDateTime, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL) + ZEND_ME(MongoDB_BSON_UTCDateTime, toDateTimeImmutable, arginfo_class_MongoDB_BSON_UTCDateTime_toDateTimeImmutable, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL) ZEND_ME(MongoDB_BSON_UTCDateTime, __toString, arginfo_class_MongoDB_BSON_UTCDateTime___toString, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL) ZEND_ME(MongoDB_BSON_UTCDateTime, __set_state, arginfo_class_MongoDB_BSON_UTCDateTime___set_state, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC|ZEND_ACC_FINAL) ZEND_ME(MongoDB_BSON_UTCDateTime, serialize, arginfo_class_MongoDB_BSON_UTCDateTime_serialize, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL) diff --git a/src/LIBMONGOCRYPT_VERSION_CURRENT b/src/LIBMONGOCRYPT_VERSION_CURRENT index 4dae2985b..1cac385c6 100644 --- a/src/LIBMONGOCRYPT_VERSION_CURRENT +++ b/src/LIBMONGOCRYPT_VERSION_CURRENT @@ -1 +1 @@ -1.10.1 +1.11.0 diff --git a/src/LIBMONGOC_VERSION_CURRENT b/src/LIBMONGOC_VERSION_CURRENT index bd9c63786..1f22968d1 100644 --- a/src/LIBMONGOC_VERSION_CURRENT +++ b/src/LIBMONGOC_VERSION_CURRENT @@ -1 +1 @@ -1.27.5 +1.28.0-20240827+git1858014e01 diff --git a/src/MongoDB/BulkWrite.c b/src/MongoDB/BulkWrite.c index 49072dfe8..2afe572b1 100644 --- a/src/MongoDB/BulkWrite.c +++ b/src/MongoDB/BulkWrite.c @@ -641,7 +641,7 @@ static HashTable* php_phongo_bulkwrite_get_debug_info(phongo_compat_object_handl } ADD_ASSOC_BOOL_EX(&retval, "executed", intern->executed); - ADD_ASSOC_LONG_EX(&retval, "server_id", mongoc_bulk_operation_get_hint(intern->bulk)); + ADD_ASSOC_LONG_EX(&retval, "server_id", mongoc_bulk_operation_get_server_id(intern->bulk)); if (!Z_ISUNDEF(intern->session)) { ADD_ASSOC_ZVAL_EX(&retval, "session", &intern->session); diff --git a/src/MongoDB/ClientEncryption.c b/src/MongoDB/ClientEncryption.c index ee5ef3bd7..8dc85edaa 100644 --- a/src/MongoDB/ClientEncryption.c +++ b/src/MongoDB/ClientEncryption.c @@ -850,6 +850,17 @@ static mongoc_client_encryption_encrypt_range_opts_t* phongo_clientencryption_en return opts; } + if (php_array_existsc(options, "trimFactor")) { + int64_t trimfactor = php_array_fetchc_long(options, "trimFactor"); + + if (trimfactor < 0 || trimfactor > INT32_MAX) { + phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT, "Expected \"trimFactor\" range option to be a positive 32-bit integer, %" PRId64 " given", trimfactor); + goto cleanup; + } + + mongoc_client_encryption_encrypt_range_opts_set_trim_factor(opts, (int32_t) trimfactor); + } + if (php_array_existsc(options, "sparsity")) { int64_t sparsity = php_array_fetchc_long(options, "sparsity"); diff --git a/src/MongoDB/ClientEncryption.stub.php b/src/MongoDB/ClientEncryption.stub.php index d64527f27..b39fccfbc 100644 --- a/src/MongoDB/ClientEncryption.stub.php +++ b/src/MongoDB/ClientEncryption.stub.php @@ -34,6 +34,13 @@ final class ClientEncryption public const ALGORITHM_UNINDEXED = UNKNOWN; /** + * @var string + * @cvalue MONGOC_ENCRYPT_ALGORITHM_RANGE + */ + public const ALGORITHM_RANGE = UNKNOWN; + + /** + * @deprecated * @var string * @cvalue MONGOC_ENCRYPT_ALGORITHM_RANGEPREVIEW */ @@ -46,6 +53,13 @@ final class ClientEncryption public const QUERY_TYPE_EQUALITY = UNKNOWN; /** + * @var string + * @cvalue MONGOC_ENCRYPT_QUERY_TYPE_RANGE + */ + public const QUERY_TYPE_RANGE = UNKNOWN; + + /** + * @deprecated * @var string * @cvalue MONGOC_ENCRYPT_QUERY_TYPE_RANGEPREVIEW */ diff --git a/src/MongoDB/ClientEncryption_arginfo.h b/src/MongoDB/ClientEncryption_arginfo.h index 0df229f5b..9e779d592 100644 --- a/src/MongoDB/ClientEncryption_arginfo.h +++ b/src/MongoDB/ClientEncryption_arginfo.h @@ -1,5 +1,5 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: ec6f4a230cb96e8985f250b7d716dd86fbc5e0ea */ + * Stub hash: 6b4f3a99f4dd97b08ee22a15985f0ffc4fe34ace */ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_MongoDB_Driver_ClientEncryption___construct, 0, 0, 1) ZEND_ARG_TYPE_INFO(0, options, IS_ARRAY, 0) @@ -193,11 +193,18 @@ static zend_class_entry *register_class_MongoDB_Driver_ClientEncryption(void) zend_declare_class_constant_ex(class_entry, const_ALGORITHM_UNINDEXED_name, &const_ALGORITHM_UNINDEXED_value, ZEND_ACC_PUBLIC, NULL); zend_string_release(const_ALGORITHM_UNINDEXED_name); + zval const_ALGORITHM_RANGE_value; + zend_string *const_ALGORITHM_RANGE_value_str = zend_string_init(MONGOC_ENCRYPT_ALGORITHM_RANGE, strlen(MONGOC_ENCRYPT_ALGORITHM_RANGE), 1); + ZVAL_STR(&const_ALGORITHM_RANGE_value, const_ALGORITHM_RANGE_value_str); + zend_string *const_ALGORITHM_RANGE_name = zend_string_init_interned("ALGORITHM_RANGE", sizeof("ALGORITHM_RANGE") - 1, 1); + zend_declare_class_constant_ex(class_entry, const_ALGORITHM_RANGE_name, &const_ALGORITHM_RANGE_value, ZEND_ACC_PUBLIC, NULL); + zend_string_release(const_ALGORITHM_RANGE_name); + zval const_ALGORITHM_RANGE_PREVIEW_value; zend_string *const_ALGORITHM_RANGE_PREVIEW_value_str = zend_string_init(MONGOC_ENCRYPT_ALGORITHM_RANGEPREVIEW, strlen(MONGOC_ENCRYPT_ALGORITHM_RANGEPREVIEW), 1); ZVAL_STR(&const_ALGORITHM_RANGE_PREVIEW_value, const_ALGORITHM_RANGE_PREVIEW_value_str); zend_string *const_ALGORITHM_RANGE_PREVIEW_name = zend_string_init_interned("ALGORITHM_RANGE_PREVIEW", sizeof("ALGORITHM_RANGE_PREVIEW") - 1, 1); - zend_declare_class_constant_ex(class_entry, const_ALGORITHM_RANGE_PREVIEW_name, &const_ALGORITHM_RANGE_PREVIEW_value, ZEND_ACC_PUBLIC, NULL); + zend_declare_class_constant_ex(class_entry, const_ALGORITHM_RANGE_PREVIEW_name, &const_ALGORITHM_RANGE_PREVIEW_value, ZEND_ACC_PUBLIC|ZEND_ACC_DEPRECATED, NULL); zend_string_release(const_ALGORITHM_RANGE_PREVIEW_name); zval const_QUERY_TYPE_EQUALITY_value; @@ -207,11 +214,18 @@ static zend_class_entry *register_class_MongoDB_Driver_ClientEncryption(void) zend_declare_class_constant_ex(class_entry, const_QUERY_TYPE_EQUALITY_name, &const_QUERY_TYPE_EQUALITY_value, ZEND_ACC_PUBLIC, NULL); zend_string_release(const_QUERY_TYPE_EQUALITY_name); + zval const_QUERY_TYPE_RANGE_value; + zend_string *const_QUERY_TYPE_RANGE_value_str = zend_string_init(MONGOC_ENCRYPT_QUERY_TYPE_RANGE, strlen(MONGOC_ENCRYPT_QUERY_TYPE_RANGE), 1); + ZVAL_STR(&const_QUERY_TYPE_RANGE_value, const_QUERY_TYPE_RANGE_value_str); + zend_string *const_QUERY_TYPE_RANGE_name = zend_string_init_interned("QUERY_TYPE_RANGE", sizeof("QUERY_TYPE_RANGE") - 1, 1); + zend_declare_class_constant_ex(class_entry, const_QUERY_TYPE_RANGE_name, &const_QUERY_TYPE_RANGE_value, ZEND_ACC_PUBLIC, NULL); + zend_string_release(const_QUERY_TYPE_RANGE_name); + zval const_QUERY_TYPE_RANGE_PREVIEW_value; zend_string *const_QUERY_TYPE_RANGE_PREVIEW_value_str = zend_string_init(MONGOC_ENCRYPT_QUERY_TYPE_RANGEPREVIEW, strlen(MONGOC_ENCRYPT_QUERY_TYPE_RANGEPREVIEW), 1); ZVAL_STR(&const_QUERY_TYPE_RANGE_PREVIEW_value, const_QUERY_TYPE_RANGE_PREVIEW_value_str); zend_string *const_QUERY_TYPE_RANGE_PREVIEW_name = zend_string_init_interned("QUERY_TYPE_RANGE_PREVIEW", sizeof("QUERY_TYPE_RANGE_PREVIEW") - 1, 1); - zend_declare_class_constant_ex(class_entry, const_QUERY_TYPE_RANGE_PREVIEW_name, &const_QUERY_TYPE_RANGE_PREVIEW_value, ZEND_ACC_PUBLIC, NULL); + zend_declare_class_constant_ex(class_entry, const_QUERY_TYPE_RANGE_PREVIEW_name, &const_QUERY_TYPE_RANGE_PREVIEW_value, ZEND_ACC_PUBLIC|ZEND_ACC_DEPRECATED, NULL); zend_string_release(const_QUERY_TYPE_RANGE_PREVIEW_name); return class_entry; diff --git a/src/MongoDB/Cursor.c b/src/MongoDB/Cursor.c index 085a9df7e..96bf61fea 100644 --- a/src/MongoDB/Cursor.c +++ b/src/MongoDB/Cursor.c @@ -446,7 +446,7 @@ static void phongo_cursor_init(zval* return_value, zval* manager, mongoc_cursor_ intern = Z_CURSOR_OBJ_P(return_value); intern->cursor = cursor; - intern->server_id = mongoc_cursor_get_hint(cursor); + intern->server_id = mongoc_cursor_get_server_id(cursor); intern->advanced = false; intern->current = 0; @@ -485,7 +485,7 @@ bool phongo_cursor_init_for_query(zval* return_value, zval* manager, mongoc_curs php_phongo_cursor_t* intern; /* Advancing the cursor before phongo_cursor_init ensures that a server - * stream is obtained before mongoc_cursor_get_hint() is called. */ + * stream is obtained before mongoc_cursor_get_server_id() is called. */ if (!phongo_cursor_advance_and_check_for_error(cursor)) { /* Exception should already have been thrown */ return false; diff --git a/src/MongoDB/Exception/SSLConnectionException.stub.php b/src/MongoDB/Exception/SSLConnectionException.stub.php index 5401b8844..0c6ae5446 100644 --- a/src/MongoDB/Exception/SSLConnectionException.stub.php +++ b/src/MongoDB/Exception/SSLConnectionException.stub.php @@ -7,6 +7,7 @@ namespace MongoDB\Driver\Exception; +/** @deprecated use ConnectionException instead */ final class SSLConnectionException extends ConnectionException { } diff --git a/src/MongoDB/Exception/SSLConnectionException_arginfo.h b/src/MongoDB/Exception/SSLConnectionException_arginfo.h index 668f79829..16098231a 100644 --- a/src/MongoDB/Exception/SSLConnectionException_arginfo.h +++ b/src/MongoDB/Exception/SSLConnectionException_arginfo.h @@ -1,5 +1,5 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: 95855dc37941494d4bb81c28077c1fa79153d027 */ + * Stub hash: 2948889569c0558ad634e3d05360b9d942dbb282 */ @@ -14,7 +14,7 @@ static zend_class_entry *register_class_MongoDB_Driver_Exception_SSLConnectionEx INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver\\Exception", "SSLConnectionException", class_MongoDB_Driver_Exception_SSLConnectionException_methods); class_entry = zend_register_internal_class_ex(&ce, class_entry_MongoDB_Driver_Exception_ConnectionException); - class_entry->ce_flags |= ZEND_ACC_FINAL; + class_entry->ce_flags |= ZEND_ACC_FINAL|ZEND_ACC_DEPRECATED; return class_entry; } diff --git a/src/MongoDB/Exception/WriteException.stub.php b/src/MongoDB/Exception/WriteException.stub.php index dc95a78b2..4372e933a 100644 --- a/src/MongoDB/Exception/WriteException.stub.php +++ b/src/MongoDB/Exception/WriteException.stub.php @@ -7,6 +7,7 @@ namespace MongoDB\Driver\Exception; +/** @deprecated use MongoDB\Driver\Exception\BulkWriteException instead */ abstract class WriteException extends RuntimeException { /** @var \MongoDB\Driver\WriteResult */ diff --git a/src/MongoDB/Exception/WriteException_arginfo.h b/src/MongoDB/Exception/WriteException_arginfo.h index 2692bac03..9c3e9f43d 100644 --- a/src/MongoDB/Exception/WriteException_arginfo.h +++ b/src/MongoDB/Exception/WriteException_arginfo.h @@ -1,5 +1,5 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: 93ac52bdf35d69310a30f335be70489ba52edd51 */ + * Stub hash: bf7229dbad041a8fe73af62d1961700783a933e3 */ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class_MongoDB_Driver_Exception_WriteException_getWriteResult, 0, 0, MongoDB\\Driver\\WriteResult, 0) ZEND_END_ARG_INFO() @@ -19,7 +19,7 @@ static zend_class_entry *register_class_MongoDB_Driver_Exception_WriteException( INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver\\Exception", "WriteException", class_MongoDB_Driver_Exception_WriteException_methods); class_entry = zend_register_internal_class_ex(&ce, class_entry_MongoDB_Driver_Exception_RuntimeException); - class_entry->ce_flags |= ZEND_ACC_ABSTRACT; + class_entry->ce_flags |= ZEND_ACC_ABSTRACT|ZEND_ACC_DEPRECATED; zval property_writeResult_default_value; ZVAL_NULL(&property_writeResult_default_value); diff --git a/src/MongoDB/Monitoring/ServerHeartbeatSucceededEvent.c b/src/MongoDB/Monitoring/ServerHeartbeatSucceededEvent.c index 606b4f524..8101c6e6f 100644 --- a/src/MongoDB/Monitoring/ServerHeartbeatSucceededEvent.c +++ b/src/MongoDB/Monitoring/ServerHeartbeatSucceededEvent.c @@ -124,6 +124,7 @@ static HashTable* php_phongo_serverheartbeatsucceededevent_get_debug_info(phongo ADD_ASSOC_STRING(&retval, "host", intern->host.host); ADD_ASSOC_LONG_EX(&retval, "port", intern->host.port); ADD_ASSOC_BOOL_EX(&retval, "awaited", intern->awaited); + ADD_ASSOC_INT64(&retval, "durationMicros", intern->duration_micros); if (!php_phongo_bson_to_zval_ex(intern->reply, &reply_state)) { zval_ptr_dtor(&reply_state.zchild); diff --git a/src/MongoDB/ReadPreference.c b/src/MongoDB/ReadPreference.c index fa7adbc67..927439f65 100644 --- a/src/MongoDB/ReadPreference.c +++ b/src/MongoDB/ReadPreference.c @@ -195,6 +195,8 @@ static PHP_METHOD(MongoDB_Driver_ReadPreference, __construct) PHONGO_PARSE_PARAMETERS_END(); if (Z_TYPE_P(mode) == IS_LONG) { + php_error_docref(NULL, E_DEPRECATED, "Passing an integer mode to \"MongoDB\\Driver\\ReadPreference::__construct\" is deprecated and will be removed in a future release."); + switch (Z_LVAL_P(mode)) { case MONGOC_READ_PRIMARY: case MONGOC_READ_SECONDARY: diff --git a/src/MongoDB/ReadPreference.stub.php b/src/MongoDB/ReadPreference.stub.php index c07e7e1cc..afefec9ca 100644 --- a/src/MongoDB/ReadPreference.stub.php +++ b/src/MongoDB/ReadPreference.stub.php @@ -12,30 +12,35 @@ final class ReadPreference implements \MongoDB\BSON\Serializable, \Serializable /** * @var int * @cvalue MONGOC_READ_PRIMARY + * @deprecated */ public const RP_PRIMARY = UNKNOWN; /** * @var int * @cvalue MONGOC_READ_PRIMARY_PREFERRED + * @deprecated */ public const RP_PRIMARY_PREFERRED = UNKNOWN; /** * @var int * @cvalue MONGOC_READ_SECONDARY + * @deprecated */ public const RP_SECONDARY = UNKNOWN; /** * @var int * @cvalue MONGOC_READ_SECONDARY_PREFERRED + * @deprecated */ public const RP_SECONDARY_PREFERRED = UNKNOWN; /** * @var int * @cvalue MONGOC_READ_NEAREST + * @deprecated */ public const RP_NEAREST = UNKNOWN; @@ -92,6 +97,7 @@ final public function getHedge(): ?object {} final public function getMaxStalenessSeconds(): int {} + /** @deprecated */ final public function getMode(): int {} final public function getModeString(): string {} diff --git a/src/MongoDB/ReadPreference_arginfo.h b/src/MongoDB/ReadPreference_arginfo.h index cd04119c2..9e86c33b6 100644 --- a/src/MongoDB/ReadPreference_arginfo.h +++ b/src/MongoDB/ReadPreference_arginfo.h @@ -1,5 +1,5 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: 1a1a31ef5910ddfbe66ba6c350df216ffe25b5dd */ + * Stub hash: 5409119e964d14e52195c47daf14075fffb08926 */ #if PHP_VERSION_ID >= 80000 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_MongoDB_Driver_ReadPreference___construct, 0, 0, 1) @@ -92,7 +92,7 @@ static const zend_function_entry class_MongoDB_Driver_ReadPreference_methods[] = #endif ZEND_ME(MongoDB_Driver_ReadPreference, getHedge, arginfo_class_MongoDB_Driver_ReadPreference_getHedge, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL) ZEND_ME(MongoDB_Driver_ReadPreference, getMaxStalenessSeconds, arginfo_class_MongoDB_Driver_ReadPreference_getMaxStalenessSeconds, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL) - ZEND_ME(MongoDB_Driver_ReadPreference, getMode, arginfo_class_MongoDB_Driver_ReadPreference_getMode, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL) + ZEND_ME(MongoDB_Driver_ReadPreference, getMode, arginfo_class_MongoDB_Driver_ReadPreference_getMode, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL|ZEND_ACC_DEPRECATED) ZEND_ME(MongoDB_Driver_ReadPreference, getModeString, arginfo_class_MongoDB_Driver_ReadPreference_getModeString, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL) ZEND_ME(MongoDB_Driver_ReadPreference, getTagSets, arginfo_class_MongoDB_Driver_ReadPreference_getTagSets, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL) ZEND_ME(MongoDB_Driver_ReadPreference, __set_state, arginfo_class_MongoDB_Driver_ReadPreference___set_state, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC|ZEND_ACC_FINAL) @@ -121,31 +121,31 @@ static zend_class_entry *register_class_MongoDB_Driver_ReadPreference(zend_class zval const_RP_PRIMARY_value; ZVAL_LONG(&const_RP_PRIMARY_value, MONGOC_READ_PRIMARY); zend_string *const_RP_PRIMARY_name = zend_string_init_interned("RP_PRIMARY", sizeof("RP_PRIMARY") - 1, 1); - zend_declare_class_constant_ex(class_entry, const_RP_PRIMARY_name, &const_RP_PRIMARY_value, ZEND_ACC_PUBLIC, NULL); + zend_declare_class_constant_ex(class_entry, const_RP_PRIMARY_name, &const_RP_PRIMARY_value, ZEND_ACC_PUBLIC|ZEND_ACC_DEPRECATED, NULL); zend_string_release(const_RP_PRIMARY_name); zval const_RP_PRIMARY_PREFERRED_value; ZVAL_LONG(&const_RP_PRIMARY_PREFERRED_value, MONGOC_READ_PRIMARY_PREFERRED); zend_string *const_RP_PRIMARY_PREFERRED_name = zend_string_init_interned("RP_PRIMARY_PREFERRED", sizeof("RP_PRIMARY_PREFERRED") - 1, 1); - zend_declare_class_constant_ex(class_entry, const_RP_PRIMARY_PREFERRED_name, &const_RP_PRIMARY_PREFERRED_value, ZEND_ACC_PUBLIC, NULL); + zend_declare_class_constant_ex(class_entry, const_RP_PRIMARY_PREFERRED_name, &const_RP_PRIMARY_PREFERRED_value, ZEND_ACC_PUBLIC|ZEND_ACC_DEPRECATED, NULL); zend_string_release(const_RP_PRIMARY_PREFERRED_name); zval const_RP_SECONDARY_value; ZVAL_LONG(&const_RP_SECONDARY_value, MONGOC_READ_SECONDARY); zend_string *const_RP_SECONDARY_name = zend_string_init_interned("RP_SECONDARY", sizeof("RP_SECONDARY") - 1, 1); - zend_declare_class_constant_ex(class_entry, const_RP_SECONDARY_name, &const_RP_SECONDARY_value, ZEND_ACC_PUBLIC, NULL); + zend_declare_class_constant_ex(class_entry, const_RP_SECONDARY_name, &const_RP_SECONDARY_value, ZEND_ACC_PUBLIC|ZEND_ACC_DEPRECATED, NULL); zend_string_release(const_RP_SECONDARY_name); zval const_RP_SECONDARY_PREFERRED_value; ZVAL_LONG(&const_RP_SECONDARY_PREFERRED_value, MONGOC_READ_SECONDARY_PREFERRED); zend_string *const_RP_SECONDARY_PREFERRED_name = zend_string_init_interned("RP_SECONDARY_PREFERRED", sizeof("RP_SECONDARY_PREFERRED") - 1, 1); - zend_declare_class_constant_ex(class_entry, const_RP_SECONDARY_PREFERRED_name, &const_RP_SECONDARY_PREFERRED_value, ZEND_ACC_PUBLIC, NULL); + zend_declare_class_constant_ex(class_entry, const_RP_SECONDARY_PREFERRED_name, &const_RP_SECONDARY_PREFERRED_value, ZEND_ACC_PUBLIC|ZEND_ACC_DEPRECATED, NULL); zend_string_release(const_RP_SECONDARY_PREFERRED_name); zval const_RP_NEAREST_value; ZVAL_LONG(&const_RP_NEAREST_value, MONGOC_READ_NEAREST); zend_string *const_RP_NEAREST_name = zend_string_init_interned("RP_NEAREST", sizeof("RP_NEAREST") - 1, 1); - zend_declare_class_constant_ex(class_entry, const_RP_NEAREST_name, &const_RP_NEAREST_value, ZEND_ACC_PUBLIC, NULL); + zend_declare_class_constant_ex(class_entry, const_RP_NEAREST_name, &const_RP_NEAREST_value, ZEND_ACC_PUBLIC|ZEND_ACC_DEPRECATED, NULL); zend_string_release(const_RP_NEAREST_name); zval const_PRIMARY_value; diff --git a/src/functions.stub.php b/src/functions.stub.php index bfe063d3e..f88737c0d 100644 --- a/src/functions.stub.php +++ b/src/functions.stub.php @@ -3,26 +3,38 @@ /** @generate-function-entries */ namespace MongoDB\BSON { + /** @deprecated use MongoDB\BSON\Document::fromJSON instead */ function fromJSON(string $json): string {} #if PHP_VERSION_ID >= 80000 + /** @deprecated use MongoDB\BSON\Document::fromPHP instead */ function fromPHP(array|object $value): string {} #else - /** @param array|object $value */ + /** + * @param array|object $value + * @deprecated use MongoDB\BSON\Document::fromPHP instead + */ function fromPHP($value): string {} #endif + /** @deprecated use MongoDB\BSON\Document::toCanonicalExtendedJSON instead */ function toCanonicalExtendedJSON(string $bson): string {} + /** @deprecated */ function toJSON(string $bson): string {} #if PHP_VERSION_ID >= 80000 + /** @deprecated use MongoDB\BSON\Document::toPHP instead */ function toPHP(string $bson, ?array $typemap = null): array|object {} #else - /** @return array|object */ + /** + * @return array|object + * @deprecated use MongoDB\BSON\Document::toPHP instead + */ function toPHP(string $bson, ?array $typemap = null) {} #endif + /** @deprecated use MongoDB\BSON\Document::toRelaxedExtendedJSON instead */ function toRelaxedExtendedJSON(string $bson): string {} } diff --git a/src/functions_arginfo.h b/src/functions_arginfo.h index caa79dc74..3f1c817f6 100644 --- a/src/functions_arginfo.h +++ b/src/functions_arginfo.h @@ -1,5 +1,5 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: 0d44b64d71d01a6f4989496a46fb0d560e192477 */ + * Stub hash: aa1e54b86d6186cc8b0d7c4042ec6daaa177b0ef */ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_MongoDB_BSON_fromJSON, 0, 1, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, json, IS_STRING, 0) @@ -74,22 +74,22 @@ ZEND_FUNCTION(MongoDB_Driver_Monitoring_removeSubscriber); static const zend_function_entry ext_functions[] = { - ZEND_NS_FALIAS("MongoDB\\BSON", fromJSON, MongoDB_BSON_fromJSON, arginfo_MongoDB_BSON_fromJSON) + ZEND_NS_DEP_FALIAS("MongoDB\\BSON", fromJSON, MongoDB_BSON_fromJSON, arginfo_MongoDB_BSON_fromJSON) #if PHP_VERSION_ID >= 80000 - ZEND_NS_FALIAS("MongoDB\\BSON", fromPHP, MongoDB_BSON_fromPHP, arginfo_MongoDB_BSON_fromPHP) + ZEND_NS_DEP_FALIAS("MongoDB\\BSON", fromPHP, MongoDB_BSON_fromPHP, arginfo_MongoDB_BSON_fromPHP) #endif #if !(PHP_VERSION_ID >= 80000) - ZEND_NS_FALIAS("MongoDB\\BSON", fromPHP, MongoDB_BSON_fromPHP, arginfo_MongoDB_BSON_fromPHP) + ZEND_NS_DEP_FALIAS("MongoDB\\BSON", fromPHP, MongoDB_BSON_fromPHP, arginfo_MongoDB_BSON_fromPHP) #endif - ZEND_NS_FALIAS("MongoDB\\BSON", toCanonicalExtendedJSON, MongoDB_BSON_toCanonicalExtendedJSON, arginfo_MongoDB_BSON_toCanonicalExtendedJSON) - ZEND_NS_FALIAS("MongoDB\\BSON", toJSON, MongoDB_BSON_toJSON, arginfo_MongoDB_BSON_toJSON) + ZEND_NS_DEP_FALIAS("MongoDB\\BSON", toCanonicalExtendedJSON, MongoDB_BSON_toCanonicalExtendedJSON, arginfo_MongoDB_BSON_toCanonicalExtendedJSON) + ZEND_NS_DEP_FALIAS("MongoDB\\BSON", toJSON, MongoDB_BSON_toJSON, arginfo_MongoDB_BSON_toJSON) #if PHP_VERSION_ID >= 80000 - ZEND_NS_FALIAS("MongoDB\\BSON", toPHP, MongoDB_BSON_toPHP, arginfo_MongoDB_BSON_toPHP) + ZEND_NS_DEP_FALIAS("MongoDB\\BSON", toPHP, MongoDB_BSON_toPHP, arginfo_MongoDB_BSON_toPHP) #endif #if !(PHP_VERSION_ID >= 80000) - ZEND_NS_FALIAS("MongoDB\\BSON", toPHP, MongoDB_BSON_toPHP, arginfo_MongoDB_BSON_toPHP) + ZEND_NS_DEP_FALIAS("MongoDB\\BSON", toPHP, MongoDB_BSON_toPHP, arginfo_MongoDB_BSON_toPHP) #endif - ZEND_NS_FALIAS("MongoDB\\BSON", toRelaxedExtendedJSON, MongoDB_BSON_toRelaxedExtendedJSON, arginfo_MongoDB_BSON_toRelaxedExtendedJSON) + ZEND_NS_DEP_FALIAS("MongoDB\\BSON", toRelaxedExtendedJSON, MongoDB_BSON_toRelaxedExtendedJSON, arginfo_MongoDB_BSON_toRelaxedExtendedJSON) ZEND_NS_FALIAS("MongoDB\\Driver\\Monitoring", addSubscriber, MongoDB_Driver_Monitoring_addSubscriber, arginfo_MongoDB_Driver_Monitoring_addSubscriber) ZEND_NS_FALIAS("MongoDB\\Driver\\Monitoring", mongoc_log, MongoDB_Driver_Monitoring_mongoc_log, arginfo_MongoDB_Driver_Monitoring_mongoc_log) ZEND_NS_FALIAS("MongoDB\\Driver\\Monitoring", removeSubscriber, MongoDB_Driver_Monitoring_removeSubscriber, arginfo_MongoDB_Driver_Monitoring_removeSubscriber) diff --git a/src/libmongoc b/src/libmongoc index 01decf26c..1858014e0 160000 --- a/src/libmongoc +++ b/src/libmongoc @@ -1 +1 @@ -Subproject commit 01decf26c18b1b89d97d3b55317910a3460741ae +Subproject commit 1858014e01c15a85b82c3980f53757e579834af2 diff --git a/src/libmongocrypt b/src/libmongocrypt index 654385b2f..9a88ac569 160000 --- a/src/libmongocrypt +++ b/src/libmongocrypt @@ -1 +1 @@ -Subproject commit 654385b2f898caefcb923110b7fa7f340d4b993d +Subproject commit 9a88ac5698e8e3ffcd6580b98c247f0126f26c40 diff --git a/src/phongo_execute.c b/src/phongo_execute.c index 038d980b9..b80d76002 100644 --- a/src/phongo_execute.c +++ b/src/phongo_execute.c @@ -276,7 +276,7 @@ bool phongo_execute_bulk_write(zval* manager, const char* namespace, php_phongo_ mongoc_bulk_operation_set_database(bulk, bulk_write->database); mongoc_bulk_operation_set_collection(bulk, bulk_write->collection); mongoc_bulk_operation_set_client(bulk, client); - mongoc_bulk_operation_set_hint(bulk, server_id); + mongoc_bulk_operation_set_server_id(bulk, server_id); if (zsession) { ZVAL_ZVAL(&bulk_write->session, zsession, 1, 0); @@ -290,7 +290,7 @@ bool phongo_execute_bulk_write(zval* manager, const char* namespace, php_phongo_ success = mongoc_bulk_operation_execute(bulk, &reply, &error); bulk_write->executed = true; - writeresult = phongo_writeresult_init(return_value, &reply, manager, mongoc_bulk_operation_get_hint(bulk)); + writeresult = phongo_writeresult_init(return_value, &reply, manager, mongoc_bulk_operation_get_server_id(bulk)); writeresult->write_concern = mongoc_write_concern_copy(write_concern); /* A BulkWriteException is always thrown if mongoc_bulk_operation_execute() diff --git a/src/phongo_structs.h b/src/phongo_structs.h index 3d1f508a2..3c0979438 100644 --- a/src/phongo_structs.h +++ b/src/phongo_structs.h @@ -341,7 +341,7 @@ typedef struct { typedef struct { bool awaited; - uint64_t duration_micros; + int64_t duration_micros; zval z_error; mongoc_host_list_t host; zend_object std; @@ -355,7 +355,7 @@ typedef struct { typedef struct { bool awaited; - uint64_t duration_micros; + int64_t duration_micros; mongoc_host_list_t host; bson_t* reply; zend_object std; diff --git a/tests/apm/serverHeartbeatSucceededEvent-001.phpt b/tests/apm/serverHeartbeatSucceededEvent-001.phpt index 1c06cc200..4eb3d2679 100644 --- a/tests/apm/serverHeartbeatSucceededEvent-001.phpt +++ b/tests/apm/serverHeartbeatSucceededEvent-001.phpt @@ -68,6 +68,8 @@ object(MongoDB\Driver\Monitoring\ServerHeartbeatSucceededEvent)#%d (%d) { int(%d) ["awaited"]=> bool(%s) + ["durationMicros"]=> + int(%d) ["reply"]=> object(stdClass)#%d (%d) {%A } diff --git a/tests/atlas.phpt b/tests/atlas.phpt index c0ef24e8f..00875b0db 100644 --- a/tests/atlas.phpt +++ b/tests/atlas.phpt @@ -2,23 +2,40 @@ Atlas Connectivity Tests --SKIPIF-- - --FILE-- 1]); $query = new \MongoDB\Driver\Query([]); -foreach (getAtlasConnectivityUrls() as $url) { - if (strpos($url, '#') === 0) { - echo trim(substr($url, 1)), "\n"; +foreach ($envs as $env) { + echo $env, ': '; + $uri = getenv($env); + + if (! is_string($uri)) { + echo "FAIL: env var is undefined\n"; continue; } try { - $m = new \MongoDB\Driver\Manager($url); + $m = new \MongoDB\Driver\Manager($uri); $m->executeCommand('admin', $command); iterator_to_array($m->executeQuery('test.test', $query)); echo "PASS\n"; @@ -30,25 +47,16 @@ foreach (getAtlasConnectivityUrls() as $url) { ===DONE=== --EXPECTF-- -Atlas Serverless -PASS -PASS -Atlas replica set (4.0) -PASS -PASS -Atlas sharded cluster (4.0) -PASS -PASS -Atlas free tier replica set -PASS -PASS -Atlas with only TLSv1.1 enabled (4.0) -PASS -PASS -Atlas with only TLSv1.2 enabled (4.0) -PASS -PASS -Atlas with only TLSv1.2 enabled (4.0) and bad credentials -FAIL: %s -FAIL: %s +ATLAS_SERVERLESS: PASS +ATLAS_SRV_SERVERLESS: PASS +ATLAS_FREE: PASS +ATLAS_SRV_FREE: PASS +ATLAS_REPL: PASS +ATLAS_SRV_REPL: PASS +ATLAS_SHRD: PASS +ATLAS_SRV_SHRD: PASS +ATLAS_TLS11: PASS +ATLAS_SRV_TLS11: PASS +ATLAS_TLS12: PASS +ATLAS_SRV_TLS12: PASS ===DONE=== diff --git a/tests/bson-corpus/array-decodeError-001.phpt b/tests/bson-corpus/array-decodeError-001.phpt index 31d05a44e..1c21c2d93 100644 --- a/tests/bson-corpus/array-decodeError-001.phpt +++ b/tests/bson-corpus/array-decodeError-001.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('140000000461000D0000001030000A0000000000'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/array-decodeError-002.phpt b/tests/bson-corpus/array-decodeError-002.phpt index d05de5828..eaff05022 100644 --- a/tests/bson-corpus/array-decodeError-002.phpt +++ b/tests/bson-corpus/array-decodeError-002.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('140000000461000B0000001030000A0000000000'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/array-decodeError-003.phpt b/tests/bson-corpus/array-decodeError-003.phpt index 28c69b576..7e08a5191 100644 --- a/tests/bson-corpus/array-decodeError-003.phpt +++ b/tests/bson-corpus/array-decodeError-003.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('1A00000004666F6F00100000000230000500000062617A000000'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/array-valid-001.phpt b/tests/bson-corpus/array-valid-001.phpt index c161962c9..653660c2e 100644 --- a/tests/bson-corpus/array-valid-001.phpt +++ b/tests/bson-corpus/array-valid-001.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('0D000000046100050000000000'); $canonicalExtJson = '{"a" : []}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 0d000000046100050000000000 -0d000000046100050000000000 -{"a":[]} {"a":[]} 0d000000046100050000000000 -0d000000046100050000000000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/array-valid-002.phpt b/tests/bson-corpus/array-valid-002.phpt index c49facd50..a3fe20bb1 100644 --- a/tests/bson-corpus/array-valid-002.phpt +++ b/tests/bson-corpus/array-valid-002.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('140000000461000C0000001030000A0000000000'); $canonicalExtJson = '{"a" : [{"$numberInt": "10"}]}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 140000000461000c0000001030000a0000000000 -140000000461000c0000001030000a0000000000 -{"a":[{"$numberInt":"10"}]} {"a":[{"$numberInt":"10"}]} 140000000461000c0000001030000a0000000000 -140000000461000c0000001030000a0000000000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/array-valid-003.phpt b/tests/bson-corpus/array-valid-003.phpt index af61e4818..6aae3637a 100644 --- a/tests/bson-corpus/array-valid-003.phpt +++ b/tests/bson-corpus/array-valid-003.phpt @@ -13,32 +13,17 @@ $canonicalBson = hex2bin('140000000461000C0000001030000A0000000000'); $degenerateBson = hex2bin('130000000461000B00000010000A0000000000'); $canonicalExtJson = '{"a" : [{"$numberInt": "10"}]}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($degenerateBson))), "\n"; - // Degenerate BSON -> BSON object -> Canonical BSON -echo bin2hex(fromPHP(MongoDB\BSON\Document::fromBSON($degenerateBson)->toPHP())), "\n"; - -// Degenerate BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($degenerateBson)), "\n"; +echo bin2hex((string) MongoDB\BSON\Document::fromPHP(MongoDB\BSON\Document::fromBSON($degenerateBson)->toPHP())), "\n"; // Degenerate BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($degenerateBson)->toCanonicalExtendedJSON()), "\n"; @@ -48,13 +33,8 @@ echo json_canonicalize(MongoDB\BSON\Document::fromBSON($degenerateBson)->toCanon --EXPECT-- 140000000461000c0000001030000a0000000000 -140000000461000c0000001030000a0000000000 -{"a":[{"$numberInt":"10"}]} {"a":[{"$numberInt":"10"}]} 140000000461000c0000001030000a0000000000 140000000461000c0000001030000a0000000000 -140000000461000c0000001030000a0000000000 -140000000461000c0000001030000a0000000000 -{"a":[{"$numberInt":"10"}]} {"a":[{"$numberInt":"10"}]} ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/array-valid-004.phpt b/tests/bson-corpus/array-valid-004.phpt index 724625adc..ed9193106 100644 --- a/tests/bson-corpus/array-valid-004.phpt +++ b/tests/bson-corpus/array-valid-004.phpt @@ -13,32 +13,17 @@ $canonicalBson = hex2bin('140000000461000C0000001030000A0000000000'); $degenerateBson = hex2bin('150000000461000D000000106162000A0000000000'); $canonicalExtJson = '{"a" : [{"$numberInt": "10"}]}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($degenerateBson))), "\n"; - // Degenerate BSON -> BSON object -> Canonical BSON -echo bin2hex(fromPHP(MongoDB\BSON\Document::fromBSON($degenerateBson)->toPHP())), "\n"; - -// Degenerate BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($degenerateBson)), "\n"; +echo bin2hex((string) MongoDB\BSON\Document::fromPHP(MongoDB\BSON\Document::fromBSON($degenerateBson)->toPHP())), "\n"; // Degenerate BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($degenerateBson)->toCanonicalExtendedJSON()), "\n"; @@ -48,13 +33,8 @@ echo json_canonicalize(MongoDB\BSON\Document::fromBSON($degenerateBson)->toCanon --EXPECT-- 140000000461000c0000001030000a0000000000 -140000000461000c0000001030000a0000000000 -{"a":[{"$numberInt":"10"}]} {"a":[{"$numberInt":"10"}]} 140000000461000c0000001030000a0000000000 140000000461000c0000001030000a0000000000 -140000000461000c0000001030000a0000000000 -140000000461000c0000001030000a0000000000 -{"a":[{"$numberInt":"10"}]} {"a":[{"$numberInt":"10"}]} ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/array-valid-005.phpt b/tests/bson-corpus/array-valid-005.phpt index 7fe800492..e3a3d9371 100644 --- a/tests/bson-corpus/array-valid-005.phpt +++ b/tests/bson-corpus/array-valid-005.phpt @@ -13,32 +13,17 @@ $canonicalBson = hex2bin('1b000000046100130000001030000a000000103100140000000000 $degenerateBson = hex2bin('1b000000046100130000001030000a000000103000140000000000'); $canonicalExtJson = '{"a" : [{"$numberInt": "10"}, {"$numberInt": "20"}]}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($degenerateBson))), "\n"; - // Degenerate BSON -> BSON object -> Canonical BSON -echo bin2hex(fromPHP(MongoDB\BSON\Document::fromBSON($degenerateBson)->toPHP())), "\n"; - -// Degenerate BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($degenerateBson)), "\n"; +echo bin2hex((string) MongoDB\BSON\Document::fromPHP(MongoDB\BSON\Document::fromBSON($degenerateBson)->toPHP())), "\n"; // Degenerate BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($degenerateBson)->toCanonicalExtendedJSON()), "\n"; @@ -48,13 +33,8 @@ echo json_canonicalize(MongoDB\BSON\Document::fromBSON($degenerateBson)->toCanon --EXPECT-- 1b000000046100130000001030000a000000103100140000000000 -1b000000046100130000001030000a000000103100140000000000 -{"a":[{"$numberInt":"10"},{"$numberInt":"20"}]} {"a":[{"$numberInt":"10"},{"$numberInt":"20"}]} 1b000000046100130000001030000a000000103100140000000000 1b000000046100130000001030000a000000103100140000000000 -1b000000046100130000001030000a000000103100140000000000 -1b000000046100130000001030000a000000103100140000000000 -{"a":[{"$numberInt":"10"},{"$numberInt":"20"}]} {"a":[{"$numberInt":"10"},{"$numberInt":"20"}]} ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/binary-decodeError-001.phpt b/tests/bson-corpus/binary-decodeError-001.phpt index e65c574bd..377254cd5 100644 --- a/tests/bson-corpus/binary-decodeError-001.phpt +++ b/tests/bson-corpus/binary-decodeError-001.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('1D000000057800FF0000000573FFD26444B34C6990E8E7D1DFC035D400'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/binary-decodeError-002.phpt b/tests/bson-corpus/binary-decodeError-002.phpt index 8eee21842..bbe2a1b6b 100644 --- a/tests/bson-corpus/binary-decodeError-002.phpt +++ b/tests/bson-corpus/binary-decodeError-002.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('0D000000057800FFFFFFFF0000'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/binary-decodeError-003.phpt b/tests/bson-corpus/binary-decodeError-003.phpt index 14db9e791..85d1ebe81 100644 --- a/tests/bson-corpus/binary-decodeError-003.phpt +++ b/tests/bson-corpus/binary-decodeError-003.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('13000000057800060000000203000000FFFF00'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/binary-decodeError-004.phpt b/tests/bson-corpus/binary-decodeError-004.phpt index 36403a6c4..fab2ced78 100644 --- a/tests/bson-corpus/binary-decodeError-004.phpt +++ b/tests/bson-corpus/binary-decodeError-004.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('13000000057800060000000201000000FFFF00'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/binary-decodeError-005.phpt b/tests/bson-corpus/binary-decodeError-005.phpt index a5caa2eae..3ce66293f 100644 --- a/tests/bson-corpus/binary-decodeError-005.phpt +++ b/tests/bson-corpus/binary-decodeError-005.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('130000000578000600000002FFFFFFFFFFFF00'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/binary-parseError-001.phpt b/tests/bson-corpus/binary-parseError-001.phpt index f888380cc..5bd7b05e8 100644 --- a/tests/bson-corpus/binary-parseError-001.phpt +++ b/tests/bson-corpus/binary-parseError-001.phpt @@ -10,7 +10,7 @@ DO NOT EDIT THIS FILE require_once __DIR__ . '/../utils/basic.inc'; throws(function() { - fromJSON('{"x" : { "$uuid" : { "data" : "73ffd264-44b3-4c69-90e8-e7d1dfc035d4"}}}'); + MongoDB\BSON\Document::fromJSON('{"x" : { "$uuid" : { "data" : "73ffd264-44b3-4c69-90e8-e7d1dfc035d4"}}}'); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/binary-parseError-002.phpt b/tests/bson-corpus/binary-parseError-002.phpt index 58e394fec..0cfe58dc7 100644 --- a/tests/bson-corpus/binary-parseError-002.phpt +++ b/tests/bson-corpus/binary-parseError-002.phpt @@ -10,7 +10,7 @@ DO NOT EDIT THIS FILE require_once __DIR__ . '/../utils/basic.inc'; throws(function() { - fromJSON('{"x" : { "$uuid" : "73ffd264-44b3-90e8-e7d1dfc035d4"}}'); + MongoDB\BSON\Document::fromJSON('{"x" : { "$uuid" : "73ffd264-44b3-90e8-e7d1dfc035d4"}}'); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/binary-parseError-003.phpt b/tests/bson-corpus/binary-parseError-003.phpt index bce0a46df..d3d733d53 100644 --- a/tests/bson-corpus/binary-parseError-003.phpt +++ b/tests/bson-corpus/binary-parseError-003.phpt @@ -10,7 +10,7 @@ DO NOT EDIT THIS FILE require_once __DIR__ . '/../utils/basic.inc'; throws(function() { - fromJSON('{"x" : { "$uuid" : "73ffd264-44b3-4c69-90e8-e7d1dfc035d4-789e4"}}'); + MongoDB\BSON\Document::fromJSON('{"x" : { "$uuid" : "73ffd264-44b3-4c69-90e8-e7d1dfc035d4-789e4"}}'); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/binary-parseError-004.phpt b/tests/bson-corpus/binary-parseError-004.phpt index 27904c835..289ad8480 100644 --- a/tests/bson-corpus/binary-parseError-004.phpt +++ b/tests/bson-corpus/binary-parseError-004.phpt @@ -10,7 +10,7 @@ DO NOT EDIT THIS FILE require_once __DIR__ . '/../utils/basic.inc'; throws(function() { - fromJSON('{"x" : { "$uuid" : "73ff-d26444b-34c6-990e8e-7d1dfc035d4"}}'); + MongoDB\BSON\Document::fromJSON('{"x" : { "$uuid" : "73ff-d26444b-34c6-990e8e-7d1dfc035d4"}}'); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/binary-parseError-005.phpt b/tests/bson-corpus/binary-parseError-005.phpt index c87f25c30..df325ee67 100644 --- a/tests/bson-corpus/binary-parseError-005.phpt +++ b/tests/bson-corpus/binary-parseError-005.phpt @@ -10,7 +10,7 @@ DO NOT EDIT THIS FILE require_once __DIR__ . '/../utils/basic.inc'; throws(function() { - fromJSON('{"x" : { "$uuid" : "----d264-44b3-4--9-90e8-e7d1dfc0----"}}'); + MongoDB\BSON\Document::fromJSON('{"x" : { "$uuid" : "----d264-44b3-4--9-90e8-e7d1dfc0----"}}'); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/binary-valid-001.phpt b/tests/bson-corpus/binary-valid-001.phpt index 213ab15f5..32f530c6b 100644 --- a/tests/bson-corpus/binary-valid-001.phpt +++ b/tests/bson-corpus/binary-valid-001.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('0D000000057800000000000000'); $canonicalExtJson = '{"x" : { "$binary" : {"base64" : "", "subType" : "00"}}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 0d000000057800000000000000 -0d000000057800000000000000 -{"x":{"$binary":{"base64":"","subType":"00"}}} {"x":{"$binary":{"base64":"","subType":"00"}}} 0d000000057800000000000000 -0d000000057800000000000000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/binary-valid-002.phpt b/tests/bson-corpus/binary-valid-002.phpt index 56b3f9388..ffd672952 100644 --- a/tests/bson-corpus/binary-valid-002.phpt +++ b/tests/bson-corpus/binary-valid-002.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('0D000000057800000000000000'); $canonicalExtJson = '{"x" : { "$binary" : {"base64" : "", "subType" : "00"}}}'; $degenerateExtJson = '{"x" : { "$binary" : {"subType" : "00", "base64" : ""}}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 0d000000057800000000000000 -0d000000057800000000000000 -{"x":{"$binary":{"base64":"","subType":"00"}}} {"x":{"$binary":{"base64":"","subType":"00"}}} 0d000000057800000000000000 0d000000057800000000000000 -0d000000057800000000000000 -0d000000057800000000000000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/binary-valid-003.phpt b/tests/bson-corpus/binary-valid-003.phpt index 68a3e6eac..093a2b0af 100644 --- a/tests/bson-corpus/binary-valid-003.phpt +++ b/tests/bson-corpus/binary-valid-003.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('0F0000000578000200000000FFFF00'); $canonicalExtJson = '{"x" : { "$binary" : {"base64" : "//8=", "subType" : "00"}}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 0f0000000578000200000000ffff00 -0f0000000578000200000000ffff00 -{"x":{"$binary":{"base64":"\/\/8=","subType":"00"}}} {"x":{"$binary":{"base64":"\/\/8=","subType":"00"}}} 0f0000000578000200000000ffff00 -0f0000000578000200000000ffff00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/binary-valid-004.phpt b/tests/bson-corpus/binary-valid-004.phpt index 94ed22276..490a7ac16 100644 --- a/tests/bson-corpus/binary-valid-004.phpt +++ b/tests/bson-corpus/binary-valid-004.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('0F0000000578000200000001FFFF00'); $canonicalExtJson = '{"x" : { "$binary" : {"base64" : "//8=", "subType" : "01"}}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 0f0000000578000200000001ffff00 -0f0000000578000200000001ffff00 -{"x":{"$binary":{"base64":"\/\/8=","subType":"01"}}} {"x":{"$binary":{"base64":"\/\/8=","subType":"01"}}} 0f0000000578000200000001ffff00 -0f0000000578000200000001ffff00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/binary-valid-005.phpt b/tests/bson-corpus/binary-valid-005.phpt index df40bab5a..44e8e91ae 100644 --- a/tests/bson-corpus/binary-valid-005.phpt +++ b/tests/bson-corpus/binary-valid-005.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('13000000057800060000000202000000FFFF00'); $canonicalExtJson = '{"x" : { "$binary" : {"base64" : "//8=", "subType" : "02"}}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 13000000057800060000000202000000ffff00 -13000000057800060000000202000000ffff00 -{"x":{"$binary":{"base64":"\/\/8=","subType":"02"}}} {"x":{"$binary":{"base64":"\/\/8=","subType":"02"}}} 13000000057800060000000202000000ffff00 -13000000057800060000000202000000ffff00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/binary-valid-006.phpt b/tests/bson-corpus/binary-valid-006.phpt index ecf6430a2..5be3aa071 100644 --- a/tests/bson-corpus/binary-valid-006.phpt +++ b/tests/bson-corpus/binary-valid-006.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1D000000057800100000000373FFD26444B34C6990E8E7D1DFC035D400'); $canonicalExtJson = '{"x" : { "$binary" : {"base64" : "c//SZESzTGmQ6OfR38A11A==", "subType" : "03"}}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1d000000057800100000000373ffd26444b34c6990e8e7d1dfc035d400 -1d000000057800100000000373ffd26444b34c6990e8e7d1dfc035d400 -{"x":{"$binary":{"base64":"c\/\/SZESzTGmQ6OfR38A11A==","subType":"03"}}} {"x":{"$binary":{"base64":"c\/\/SZESzTGmQ6OfR38A11A==","subType":"03"}}} 1d000000057800100000000373ffd26444b34c6990e8e7d1dfc035d400 -1d000000057800100000000373ffd26444b34c6990e8e7d1dfc035d400 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/binary-valid-007.phpt b/tests/bson-corpus/binary-valid-007.phpt index ccae19e7d..6bfd82436 100644 --- a/tests/bson-corpus/binary-valid-007.phpt +++ b/tests/bson-corpus/binary-valid-007.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1D000000057800100000000473FFD26444B34C6990E8E7D1DFC035D400'); $canonicalExtJson = '{"x" : { "$binary" : {"base64" : "c//SZESzTGmQ6OfR38A11A==", "subType" : "04"}}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1d000000057800100000000473ffd26444b34c6990e8e7d1dfc035d400 -1d000000057800100000000473ffd26444b34c6990e8e7d1dfc035d400 -{"x":{"$binary":{"base64":"c\/\/SZESzTGmQ6OfR38A11A==","subType":"04"}}} {"x":{"$binary":{"base64":"c\/\/SZESzTGmQ6OfR38A11A==","subType":"04"}}} 1d000000057800100000000473ffd26444b34c6990e8e7d1dfc035d400 -1d000000057800100000000473ffd26444b34c6990e8e7d1dfc035d400 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/binary-valid-008.phpt b/tests/bson-corpus/binary-valid-008.phpt index f4967206d..87a570203 100644 --- a/tests/bson-corpus/binary-valid-008.phpt +++ b/tests/bson-corpus/binary-valid-008.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('1D000000057800100000000473FFD26444B34C6990E8E7D1DFC035 $canonicalExtJson = '{"x" : { "$binary" : {"base64" : "c//SZESzTGmQ6OfR38A11A==", "subType" : "04"}}}'; $degenerateExtJson = '{"x" : { "$uuid" : "73ffd264-44b3-4c69-90e8-e7d1dfc035d4"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 1d000000057800100000000473ffd26444b34c6990e8e7d1dfc035d400 -1d000000057800100000000473ffd26444b34c6990e8e7d1dfc035d400 -{"x":{"$binary":{"base64":"c\/\/SZESzTGmQ6OfR38A11A==","subType":"04"}}} {"x":{"$binary":{"base64":"c\/\/SZESzTGmQ6OfR38A11A==","subType":"04"}}} 1d000000057800100000000473ffd26444b34c6990e8e7d1dfc035d400 1d000000057800100000000473ffd26444b34c6990e8e7d1dfc035d400 -1d000000057800100000000473ffd26444b34c6990e8e7d1dfc035d400 -1d000000057800100000000473ffd26444b34c6990e8e7d1dfc035d400 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/binary-valid-009.phpt b/tests/bson-corpus/binary-valid-009.phpt index 01cd0fe4b..f72096fa0 100644 --- a/tests/bson-corpus/binary-valid-009.phpt +++ b/tests/bson-corpus/binary-valid-009.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1D000000057800100000000573FFD26444B34C6990E8E7D1DFC035D400'); $canonicalExtJson = '{"x" : { "$binary" : {"base64" : "c//SZESzTGmQ6OfR38A11A==", "subType" : "05"}}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1d000000057800100000000573ffd26444b34c6990e8e7d1dfc035d400 -1d000000057800100000000573ffd26444b34c6990e8e7d1dfc035d400 -{"x":{"$binary":{"base64":"c\/\/SZESzTGmQ6OfR38A11A==","subType":"05"}}} {"x":{"$binary":{"base64":"c\/\/SZESzTGmQ6OfR38A11A==","subType":"05"}}} 1d000000057800100000000573ffd26444b34c6990e8e7d1dfc035d400 -1d000000057800100000000573ffd26444b34c6990e8e7d1dfc035d400 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/binary-valid-010.phpt b/tests/bson-corpus/binary-valid-010.phpt index 3e93fa624..dd06fe478 100644 --- a/tests/bson-corpus/binary-valid-010.phpt +++ b/tests/bson-corpus/binary-valid-010.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1D000000057800100000000773FFD26444B34C6990E8E7D1DFC035D400'); $canonicalExtJson = '{"x" : { "$binary" : {"base64" : "c//SZESzTGmQ6OfR38A11A==", "subType" : "07"}}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1d000000057800100000000773ffd26444b34c6990e8e7d1dfc035d400 -1d000000057800100000000773ffd26444b34c6990e8e7d1dfc035d400 -{"x":{"$binary":{"base64":"c\/\/SZESzTGmQ6OfR38A11A==","subType":"07"}}} {"x":{"$binary":{"base64":"c\/\/SZESzTGmQ6OfR38A11A==","subType":"07"}}} 1d000000057800100000000773ffd26444b34c6990e8e7d1dfc035d400 -1d000000057800100000000773ffd26444b34c6990e8e7d1dfc035d400 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/binary-valid-011.phpt b/tests/bson-corpus/binary-valid-011.phpt index d19650b21..e6ab63e4c 100644 --- a/tests/bson-corpus/binary-valid-011.phpt +++ b/tests/bson-corpus/binary-valid-011.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1D000000057800100000000873FFD26444B34C6990E8E7D1DFC035D400'); $canonicalExtJson = '{"x" : { "$binary" : {"base64" : "c//SZESzTGmQ6OfR38A11A==", "subType" : "08"}}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1d000000057800100000000873ffd26444b34c6990e8e7d1dfc035d400 -1d000000057800100000000873ffd26444b34c6990e8e7d1dfc035d400 -{"x":{"$binary":{"base64":"c\/\/SZESzTGmQ6OfR38A11A==","subType":"08"}}} {"x":{"$binary":{"base64":"c\/\/SZESzTGmQ6OfR38A11A==","subType":"08"}}} 1d000000057800100000000873ffd26444b34c6990e8e7d1dfc035d400 -1d000000057800100000000873ffd26444b34c6990e8e7d1dfc035d400 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/binary-valid-012.phpt b/tests/bson-corpus/binary-valid-012.phpt index 7a8156b32..97cb25935 100644 --- a/tests/bson-corpus/binary-valid-012.phpt +++ b/tests/bson-corpus/binary-valid-012.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('0F0000000578000200000080FFFF00'); $canonicalExtJson = '{"x" : { "$binary" : {"base64" : "//8=", "subType" : "80"}}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 0f0000000578000200000080ffff00 -0f0000000578000200000080ffff00 -{"x":{"$binary":{"base64":"\/\/8=","subType":"80"}}} {"x":{"$binary":{"base64":"\/\/8=","subType":"80"}}} 0f0000000578000200000080ffff00 -0f0000000578000200000080ffff00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/binary-valid-013.phpt b/tests/bson-corpus/binary-valid-013.phpt index 4ef3b43a5..0f5a69a20 100644 --- a/tests/bson-corpus/binary-valid-013.phpt +++ b/tests/bson-corpus/binary-valid-013.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1F000000037800170000000224747970650007000000737472696E67000000'); $canonicalExtJson = '{"x" : { "$type" : "string"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1f000000037800170000000224747970650007000000737472696e67000000 -1f000000037800170000000224747970650007000000737472696e67000000 -{"x":{"$type":"string"}} {"x":{"$type":"string"}} 1f000000037800170000000224747970650007000000737472696e67000000 -1f000000037800170000000224747970650007000000737472696e67000000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/binary-valid-014.phpt b/tests/bson-corpus/binary-valid-014.phpt index 9aa7b1631..fd858c105 100644 --- a/tests/bson-corpus/binary-valid-014.phpt +++ b/tests/bson-corpus/binary-valid-014.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000000378001000000010247479706500020000000000'); $canonicalExtJson = '{"x" : { "$type" : {"$numberInt": "2"}}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000000378001000000010247479706500020000000000 -180000000378001000000010247479706500020000000000 -{"x":{"$type":{"$numberInt":"2"}}} {"x":{"$type":{"$numberInt":"2"}}} 180000000378001000000010247479706500020000000000 -180000000378001000000010247479706500020000000000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/boolean-decodeError-001.phpt b/tests/bson-corpus/boolean-decodeError-001.phpt index e2e4cb536..0c7d59a50 100644 --- a/tests/bson-corpus/boolean-decodeError-001.phpt +++ b/tests/bson-corpus/boolean-decodeError-001.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('090000000862000200'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/boolean-decodeError-002.phpt b/tests/bson-corpus/boolean-decodeError-002.phpt index d3bf65603..d04632b29 100644 --- a/tests/bson-corpus/boolean-decodeError-002.phpt +++ b/tests/bson-corpus/boolean-decodeError-002.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('09000000086200FF00'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/boolean-valid-001.phpt b/tests/bson-corpus/boolean-valid-001.phpt index 023b6ce1c..ad7737b4c 100644 --- a/tests/bson-corpus/boolean-valid-001.phpt +++ b/tests/bson-corpus/boolean-valid-001.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('090000000862000100'); $canonicalExtJson = '{"b" : true}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 090000000862000100 -090000000862000100 -{"b":true} {"b":true} 090000000862000100 -090000000862000100 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/boolean-valid-002.phpt b/tests/bson-corpus/boolean-valid-002.phpt index c0666fdd4..2da4c3696 100644 --- a/tests/bson-corpus/boolean-valid-002.phpt +++ b/tests/bson-corpus/boolean-valid-002.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('090000000862000000'); $canonicalExtJson = '{"b" : false}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 090000000862000000 -090000000862000000 -{"b":false} {"b":false} 090000000862000000 -090000000862000000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/code-decodeError-001.phpt b/tests/bson-corpus/code-decodeError-001.phpt index 39b9d206b..028560309 100644 --- a/tests/bson-corpus/code-decodeError-001.phpt +++ b/tests/bson-corpus/code-decodeError-001.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('0C0000000D61000000000000'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/code-decodeError-002.phpt b/tests/bson-corpus/code-decodeError-002.phpt index 11aac3cd5..6f8d8fd3a 100644 --- a/tests/bson-corpus/code-decodeError-002.phpt +++ b/tests/bson-corpus/code-decodeError-002.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('0C0000000D6100FFFFFFFF00'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/code-decodeError-003.phpt b/tests/bson-corpus/code-decodeError-003.phpt index 9d3749029..a969de33f 100644 --- a/tests/bson-corpus/code-decodeError-003.phpt +++ b/tests/bson-corpus/code-decodeError-003.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('100000000D6100050000006200620000'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/code-decodeError-004.phpt b/tests/bson-corpus/code-decodeError-004.phpt index 8beaf0aa4..b25cec62a 100644 --- a/tests/bson-corpus/code-decodeError-004.phpt +++ b/tests/bson-corpus/code-decodeError-004.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('120000000D00FFFFFF00666F6F6261720000'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/code-decodeError-005.phpt b/tests/bson-corpus/code-decodeError-005.phpt index 1407b247d..6f4c86d8f 100644 --- a/tests/bson-corpus/code-decodeError-005.phpt +++ b/tests/bson-corpus/code-decodeError-005.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('100000000D610004000000616263FF00'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/code-decodeError-006.phpt b/tests/bson-corpus/code-decodeError-006.phpt index be1bbaa96..37c486c44 100644 --- a/tests/bson-corpus/code-decodeError-006.phpt +++ b/tests/bson-corpus/code-decodeError-006.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('0E0000000D610001000000000000'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/code-decodeError-007.phpt b/tests/bson-corpus/code-decodeError-007.phpt index ff0abe06f..7cc1432d8 100644 --- a/tests/bson-corpus/code-decodeError-007.phpt +++ b/tests/bson-corpus/code-decodeError-007.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('0E0000000D610002000000E90000'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/code-valid-001.phpt b/tests/bson-corpus/code-valid-001.phpt index debe4ada3..6ab84ed11 100644 --- a/tests/bson-corpus/code-valid-001.phpt +++ b/tests/bson-corpus/code-valid-001.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('0D0000000D6100010000000000'); $canonicalExtJson = '{"a" : {"$code" : ""}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 0d0000000d6100010000000000 -0d0000000d6100010000000000 -{"a":{"$code":""}} {"a":{"$code":""}} 0d0000000d6100010000000000 -0d0000000d6100010000000000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/code-valid-002.phpt b/tests/bson-corpus/code-valid-002.phpt index 74a0984a2..9a39515a3 100644 --- a/tests/bson-corpus/code-valid-002.phpt +++ b/tests/bson-corpus/code-valid-002.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('0E0000000D610002000000620000'); $canonicalExtJson = '{"a" : {"$code" : "b"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 0e0000000d610002000000620000 -0e0000000d610002000000620000 -{"a":{"$code":"b"}} {"a":{"$code":"b"}} 0e0000000d610002000000620000 -0e0000000d610002000000620000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/code-valid-003.phpt b/tests/bson-corpus/code-valid-003.phpt index f0702b9f4..72d73ed5d 100644 --- a/tests/bson-corpus/code-valid-003.phpt +++ b/tests/bson-corpus/code-valid-003.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('190000000D61000D0000006162616261626162616261620000'); $canonicalExtJson = '{"a" : {"$code" : "abababababab"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 190000000d61000d0000006162616261626162616261620000 -190000000d61000d0000006162616261626162616261620000 -{"a":{"$code":"abababababab"}} {"a":{"$code":"abababababab"}} 190000000d61000d0000006162616261626162616261620000 -190000000d61000d0000006162616261626162616261620000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/code-valid-004.phpt b/tests/bson-corpus/code-valid-004.phpt index 677243d33..9f747be78 100644 --- a/tests/bson-corpus/code-valid-004.phpt +++ b/tests/bson-corpus/code-valid-004.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('190000000D61000D000000C3A9C3A9C3A9C3A9C3A9C3A90000'); $canonicalExtJson = '{"a" : {"$code" : "\\u00e9\\u00e9\\u00e9\\u00e9\\u00e9\\u00e9"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 190000000d61000d000000c3a9c3a9c3a9c3a9c3a9c3a90000 -190000000d61000d000000c3a9c3a9c3a9c3a9c3a9c3a90000 -{"a":{"$code":"\u00e9\u00e9\u00e9\u00e9\u00e9\u00e9"}} {"a":{"$code":"\u00e9\u00e9\u00e9\u00e9\u00e9\u00e9"}} 190000000d61000d000000c3a9c3a9c3a9c3a9c3a9c3a90000 -190000000d61000d000000c3a9c3a9c3a9c3a9c3a9c3a90000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/code-valid-005.phpt b/tests/bson-corpus/code-valid-005.phpt index e292efcf4..8febeba6b 100644 --- a/tests/bson-corpus/code-valid-005.phpt +++ b/tests/bson-corpus/code-valid-005.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('190000000D61000D000000E29886E29886E29886E298860000'); $canonicalExtJson = '{"a" : {"$code" : "\\u2606\\u2606\\u2606\\u2606"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 190000000d61000d000000e29886e29886e29886e298860000 -190000000d61000d000000e29886e29886e29886e298860000 -{"a":{"$code":"\u2606\u2606\u2606\u2606"}} {"a":{"$code":"\u2606\u2606\u2606\u2606"}} 190000000d61000d000000e29886e29886e29886e298860000 -190000000d61000d000000e29886e29886e29886e298860000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/code-valid-006.phpt b/tests/bson-corpus/code-valid-006.phpt index f783332a0..6e423ed7b 100644 --- a/tests/bson-corpus/code-valid-006.phpt +++ b/tests/bson-corpus/code-valid-006.phpt @@ -14,21 +14,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('190000000D61000D0000006162006261620062616261620000'); $canonicalExtJson = '{"a" : {"$code" : "ab\\u0000bab\\u0000babab"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -37,9 +28,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 190000000d61000d0000006162006261620062616261620000 -190000000d61000d0000006162006261620062616261620000 -{"a":{"$code":"ab\u0000bab\u0000babab"}} {"a":{"$code":"ab\u0000bab\u0000babab"}} 190000000d61000d0000006162006261620062616261620000 -190000000d61000d0000006162006261620062616261620000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/code_w_scope-decodeError-001.phpt b/tests/bson-corpus/code_w_scope-decodeError-001.phpt index 1ce888c5a..86079b81c 100644 --- a/tests/bson-corpus/code_w_scope-decodeError-001.phpt +++ b/tests/bson-corpus/code_w_scope-decodeError-001.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('280000000F6100000000000500000061626364001300000010780001000000107900010000000000'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/code_w_scope-decodeError-002.phpt b/tests/bson-corpus/code_w_scope-decodeError-002.phpt index dc6aeaa05..334324e7b 100644 --- a/tests/bson-corpus/code_w_scope-decodeError-002.phpt +++ b/tests/bson-corpus/code_w_scope-decodeError-002.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('280000000F6100FFFFFFFF0500000061626364001300000010780001000000107900010000000000'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/code_w_scope-decodeError-003.phpt b/tests/bson-corpus/code_w_scope-decodeError-003.phpt index ed08286a1..2b3f34312 100644 --- a/tests/bson-corpus/code_w_scope-decodeError-003.phpt +++ b/tests/bson-corpus/code_w_scope-decodeError-003.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('160000000F61000D0000000100000000050000000000'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/code_w_scope-decodeError-004.phpt b/tests/bson-corpus/code_w_scope-decodeError-004.phpt index 30f7360f6..2e3afe67b 100644 --- a/tests/bson-corpus/code_w_scope-decodeError-004.phpt +++ b/tests/bson-corpus/code_w_scope-decodeError-004.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('280000000F61001F0000000500000061626364001300000010780001000000107900010000000000'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/code_w_scope-decodeError-005.phpt b/tests/bson-corpus/code_w_scope-decodeError-005.phpt index b2bb9e112..afabca3e0 100644 --- a/tests/bson-corpus/code_w_scope-decodeError-005.phpt +++ b/tests/bson-corpus/code_w_scope-decodeError-005.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('280000000F6100210000000500000061626364001300000010780001000000107900010000000000'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/code_w_scope-decodeError-006.phpt b/tests/bson-corpus/code_w_scope-decodeError-006.phpt index 8b1d87bdd..fce7a18e6 100644 --- a/tests/bson-corpus/code_w_scope-decodeError-006.phpt +++ b/tests/bson-corpus/code_w_scope-decodeError-006.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('280000000F6100FF0000000500000061626364001300000010780001000000107900010000000000'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/code_w_scope-decodeError-007.phpt b/tests/bson-corpus/code_w_scope-decodeError-007.phpt index b8df784af..feb50f8ad 100644 --- a/tests/bson-corpus/code_w_scope-decodeError-007.phpt +++ b/tests/bson-corpus/code_w_scope-decodeError-007.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('280000000F6100200000000400000061626364001300000010780001000000107900010000000000'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/code_w_scope-decodeError-008.phpt b/tests/bson-corpus/code_w_scope-decodeError-008.phpt index ce049e42a..8a5db208d 100644 --- a/tests/bson-corpus/code_w_scope-decodeError-008.phpt +++ b/tests/bson-corpus/code_w_scope-decodeError-008.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('280000000F6100200000000600000061626364001300000010780001000000107900010000000000'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/code_w_scope-decodeError-009.phpt b/tests/bson-corpus/code_w_scope-decodeError-009.phpt index 410a1fb4c..d728e3260 100644 --- a/tests/bson-corpus/code_w_scope-decodeError-009.phpt +++ b/tests/bson-corpus/code_w_scope-decodeError-009.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('280000000F610020000000FFFFFFFF61626364001300000010780001000000107900010000000000'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/code_w_scope-decodeError-010.phpt b/tests/bson-corpus/code_w_scope-decodeError-010.phpt index 5ab879b5f..b21f1e6c8 100644 --- a/tests/bson-corpus/code_w_scope-decodeError-010.phpt +++ b/tests/bson-corpus/code_w_scope-decodeError-010.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('280000000F610020000000FF00000061626364001300000010780001000000107900010000000000'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/code_w_scope-decodeError-011.phpt b/tests/bson-corpus/code_w_scope-decodeError-011.phpt index 993c7ccf9..e1b82625d 100644 --- a/tests/bson-corpus/code_w_scope-decodeError-011.phpt +++ b/tests/bson-corpus/code_w_scope-decodeError-011.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('1C0000000F001500000001000000000C000000020000000000000000'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/code_w_scope-valid-001.phpt b/tests/bson-corpus/code_w_scope-valid-001.phpt index 0dbe5d2f6..0871e6f16 100644 --- a/tests/bson-corpus/code_w_scope-valid-001.phpt +++ b/tests/bson-corpus/code_w_scope-valid-001.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('160000000F61000E0000000100000000050000000000'); $canonicalExtJson = '{"a" : {"$code" : "", "$scope" : {}}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 160000000f61000e0000000100000000050000000000 -160000000f61000e0000000100000000050000000000 -{"a":{"$code":"","$scope":{}}} {"a":{"$code":"","$scope":{}}} 160000000f61000e0000000100000000050000000000 -160000000f61000e0000000100000000050000000000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/code_w_scope-valid-002.phpt b/tests/bson-corpus/code_w_scope-valid-002.phpt index 850f82f41..c7ea17e2d 100644 --- a/tests/bson-corpus/code_w_scope-valid-002.phpt +++ b/tests/bson-corpus/code_w_scope-valid-002.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1A0000000F610012000000050000006162636400050000000000'); $canonicalExtJson = '{"a" : {"$code" : "abcd", "$scope" : {}}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1a0000000f610012000000050000006162636400050000000000 -1a0000000f610012000000050000006162636400050000000000 -{"a":{"$code":"abcd","$scope":{}}} {"a":{"$code":"abcd","$scope":{}}} 1a0000000f610012000000050000006162636400050000000000 -1a0000000f610012000000050000006162636400050000000000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/code_w_scope-valid-003.phpt b/tests/bson-corpus/code_w_scope-valid-003.phpt index 56a9e8e36..13121a727 100644 --- a/tests/bson-corpus/code_w_scope-valid-003.phpt +++ b/tests/bson-corpus/code_w_scope-valid-003.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1D0000000F61001500000001000000000C000000107800010000000000'); $canonicalExtJson = '{"a" : {"$code" : "", "$scope" : {"x" : {"$numberInt": "1"}}}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1d0000000f61001500000001000000000c000000107800010000000000 -1d0000000f61001500000001000000000c000000107800010000000000 -{"a":{"$code":"","$scope":{"x":{"$numberInt":"1"}}}} {"a":{"$code":"","$scope":{"x":{"$numberInt":"1"}}}} 1d0000000f61001500000001000000000c000000107800010000000000 -1d0000000f61001500000001000000000c000000107800010000000000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/code_w_scope-valid-004.phpt b/tests/bson-corpus/code_w_scope-valid-004.phpt index a9d72890e..c66e375dd 100644 --- a/tests/bson-corpus/code_w_scope-valid-004.phpt +++ b/tests/bson-corpus/code_w_scope-valid-004.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('210000000F6100190000000500000061626364000C000000107800010000000000'); $canonicalExtJson = '{"a" : {"$code" : "abcd", "$scope" : {"x" : {"$numberInt": "1"}}}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 210000000f6100190000000500000061626364000c000000107800010000000000 -210000000f6100190000000500000061626364000c000000107800010000000000 -{"a":{"$code":"abcd","$scope":{"x":{"$numberInt":"1"}}}} {"a":{"$code":"abcd","$scope":{"x":{"$numberInt":"1"}}}} 210000000f6100190000000500000061626364000c000000107800010000000000 -210000000f6100190000000500000061626364000c000000107800010000000000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/code_w_scope-valid-005.phpt b/tests/bson-corpus/code_w_scope-valid-005.phpt index 1a938195e..653a9a8bf 100644 --- a/tests/bson-corpus/code_w_scope-valid-005.phpt +++ b/tests/bson-corpus/code_w_scope-valid-005.phpt @@ -14,21 +14,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1A0000000F61001200000005000000C3A9006400050000000000'); $canonicalExtJson = '{"a" : {"$code" : "\\u00e9\\u0000d", "$scope" : {}}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -37,9 +28,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1a0000000f61001200000005000000c3a9006400050000000000 -1a0000000f61001200000005000000c3a9006400050000000000 -{"a":{"$code":"\u00e9\u0000d","$scope":{}}} {"a":{"$code":"\u00e9\u0000d","$scope":{}}} 1a0000000f61001200000005000000c3a9006400050000000000 -1a0000000f61001200000005000000c3a9006400050000000000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/datetime-decodeError-001.phpt b/tests/bson-corpus/datetime-decodeError-001.phpt index 28b45757c..4ab20143c 100644 --- a/tests/bson-corpus/datetime-decodeError-001.phpt +++ b/tests/bson-corpus/datetime-decodeError-001.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('0C0000000961001234567800'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/datetime-valid-001.phpt b/tests/bson-corpus/datetime-valid-001.phpt index 8d6101dd5..43c931060 100644 --- a/tests/bson-corpus/datetime-valid-001.phpt +++ b/tests/bson-corpus/datetime-valid-001.phpt @@ -13,33 +13,18 @@ $canonicalBson = hex2bin('10000000096100000000000000000000'); $canonicalExtJson = '{"a" : {"$date" : {"$numberLong" : "0"}}}'; $relaxedExtJson = '{"a" : {"$date" : "1970-01-01T00:00:00Z"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical BSON -> Relaxed extJSON -echo json_canonicalize(toRelaxedExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Relaxed extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toRelaxedExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Relaxed extJSON -> BSON -> Relaxed extJSON -echo json_canonicalize(toRelaxedExtendedJSON(fromJSON($relaxedExtJson))), "\n"; - // Relaxed extJSON -> BSON object -> Relaxed extJSON echo json_canonicalize(MongoDB\BSON\Document::fromJSON($relaxedExtJson)->toRelaxedExtendedJSON()), "\n"; @@ -48,13 +33,8 @@ echo json_canonicalize(MongoDB\BSON\Document::fromJSON($relaxedExtJson)->toRelax --EXPECT-- 10000000096100000000000000000000 -10000000096100000000000000000000 -{"a":{"$date":{"$numberLong":"0"}}} {"a":{"$date":{"$numberLong":"0"}}} {"a":{"$date":"1970-01-01T00:00:00Z"}} -{"a":{"$date":"1970-01-01T00:00:00Z"}} 10000000096100000000000000000000 -10000000096100000000000000000000 -{"a":{"$date":"1970-01-01T00:00:00Z"}} {"a":{"$date":"1970-01-01T00:00:00Z"}} ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/datetime-valid-002.phpt b/tests/bson-corpus/datetime-valid-002.phpt index 76ac1960a..9a2970701 100644 --- a/tests/bson-corpus/datetime-valid-002.phpt +++ b/tests/bson-corpus/datetime-valid-002.phpt @@ -13,33 +13,18 @@ $canonicalBson = hex2bin('10000000096100C5D8D6CC3B01000000'); $canonicalExtJson = '{"a" : {"$date" : {"$numberLong" : "1356351330501"}}}'; $relaxedExtJson = '{"a" : {"$date" : "2012-12-24T12:15:30.501Z"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical BSON -> Relaxed extJSON -echo json_canonicalize(toRelaxedExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Relaxed extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toRelaxedExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Relaxed extJSON -> BSON -> Relaxed extJSON -echo json_canonicalize(toRelaxedExtendedJSON(fromJSON($relaxedExtJson))), "\n"; - // Relaxed extJSON -> BSON object -> Relaxed extJSON echo json_canonicalize(MongoDB\BSON\Document::fromJSON($relaxedExtJson)->toRelaxedExtendedJSON()), "\n"; @@ -48,13 +33,8 @@ echo json_canonicalize(MongoDB\BSON\Document::fromJSON($relaxedExtJson)->toRelax --EXPECT-- 10000000096100c5d8d6cc3b01000000 -10000000096100c5d8d6cc3b01000000 -{"a":{"$date":{"$numberLong":"1356351330501"}}} {"a":{"$date":{"$numberLong":"1356351330501"}}} {"a":{"$date":"2012-12-24T12:15:30.501Z"}} -{"a":{"$date":"2012-12-24T12:15:30.501Z"}} 10000000096100c5d8d6cc3b01000000 -10000000096100c5d8d6cc3b01000000 -{"a":{"$date":"2012-12-24T12:15:30.501Z"}} {"a":{"$date":"2012-12-24T12:15:30.501Z"}} ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/datetime-valid-003.phpt b/tests/bson-corpus/datetime-valid-003.phpt index ce9bb1c3f..3c102614b 100644 --- a/tests/bson-corpus/datetime-valid-003.phpt +++ b/tests/bson-corpus/datetime-valid-003.phpt @@ -13,33 +13,18 @@ $canonicalBson = hex2bin('10000000096100C33CE7B9BDFFFFFF00'); $canonicalExtJson = '{"a" : {"$date" : {"$numberLong" : "-284643869501"}}}'; $relaxedExtJson = '{"a" : {"$date" : {"$numberLong" : "-284643869501"}}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical BSON -> Relaxed extJSON -echo json_canonicalize(toRelaxedExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Relaxed extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toRelaxedExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Relaxed extJSON -> BSON -> Relaxed extJSON -echo json_canonicalize(toRelaxedExtendedJSON(fromJSON($relaxedExtJson))), "\n"; - // Relaxed extJSON -> BSON object -> Relaxed extJSON echo json_canonicalize(MongoDB\BSON\Document::fromJSON($relaxedExtJson)->toRelaxedExtendedJSON()), "\n"; @@ -48,13 +33,8 @@ echo json_canonicalize(MongoDB\BSON\Document::fromJSON($relaxedExtJson)->toRelax --EXPECT-- 10000000096100c33ce7b9bdffffff00 -10000000096100c33ce7b9bdffffff00 -{"a":{"$date":{"$numberLong":"-284643869501"}}} -{"a":{"$date":{"$numberLong":"-284643869501"}}} {"a":{"$date":{"$numberLong":"-284643869501"}}} {"a":{"$date":{"$numberLong":"-284643869501"}}} 10000000096100c33ce7b9bdffffff00 -10000000096100c33ce7b9bdffffff00 -{"a":{"$date":{"$numberLong":"-284643869501"}}} {"a":{"$date":{"$numberLong":"-284643869501"}}} ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/datetime-valid-004.phpt b/tests/bson-corpus/datetime-valid-004.phpt index f02123c33..c2ab19107 100644 --- a/tests/bson-corpus/datetime-valid-004.phpt +++ b/tests/bson-corpus/datetime-valid-004.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1000000009610000DC1FD277E6000000'); $canonicalExtJson = '{"a":{"$date":{"$numberLong":"253402300800000"}}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1000000009610000dc1fd277e6000000 -1000000009610000dc1fd277e6000000 -{"a":{"$date":{"$numberLong":"253402300800000"}}} {"a":{"$date":{"$numberLong":"253402300800000"}}} 1000000009610000dc1fd277e6000000 -1000000009610000dc1fd277e6000000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/datetime-valid-005.phpt b/tests/bson-corpus/datetime-valid-005.phpt index 5070604a1..8fbdbad75 100644 --- a/tests/bson-corpus/datetime-valid-005.phpt +++ b/tests/bson-corpus/datetime-valid-005.phpt @@ -13,33 +13,18 @@ $canonicalBson = hex2bin('10000000096100D1D6D6CC3B01000000'); $canonicalExtJson = '{"a" : {"$date" : {"$numberLong" : "1356351330001"}}}'; $relaxedExtJson = '{"a" : {"$date" : "2012-12-24T12:15:30.001Z"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical BSON -> Relaxed extJSON -echo json_canonicalize(toRelaxedExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Relaxed extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toRelaxedExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Relaxed extJSON -> BSON -> Relaxed extJSON -echo json_canonicalize(toRelaxedExtendedJSON(fromJSON($relaxedExtJson))), "\n"; - // Relaxed extJSON -> BSON object -> Relaxed extJSON echo json_canonicalize(MongoDB\BSON\Document::fromJSON($relaxedExtJson)->toRelaxedExtendedJSON()), "\n"; @@ -48,13 +33,8 @@ echo json_canonicalize(MongoDB\BSON\Document::fromJSON($relaxedExtJson)->toRelax --EXPECT-- 10000000096100d1d6d6cc3b01000000 -10000000096100d1d6d6cc3b01000000 -{"a":{"$date":{"$numberLong":"1356351330001"}}} {"a":{"$date":{"$numberLong":"1356351330001"}}} {"a":{"$date":"2012-12-24T12:15:30.001Z"}} -{"a":{"$date":"2012-12-24T12:15:30.001Z"}} 10000000096100d1d6d6cc3b01000000 -10000000096100d1d6d6cc3b01000000 -{"a":{"$date":"2012-12-24T12:15:30.001Z"}} {"a":{"$date":"2012-12-24T12:15:30.001Z"}} ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/dbpointer-decodeError-001.phpt b/tests/bson-corpus/dbpointer-decodeError-001.phpt index 0fd26d83d..929bf1c19 100644 --- a/tests/bson-corpus/dbpointer-decodeError-001.phpt +++ b/tests/bson-corpus/dbpointer-decodeError-001.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('1A0000000C6100FFFFFFFF620056E1FC72E0C917E9C471416100'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/dbpointer-decodeError-002.phpt b/tests/bson-corpus/dbpointer-decodeError-002.phpt index d03574fc7..2fdf7cf1a 100644 --- a/tests/bson-corpus/dbpointer-decodeError-002.phpt +++ b/tests/bson-corpus/dbpointer-decodeError-002.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('1A0000000C610000000000620056E1FC72E0C917E9C471416100'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/dbpointer-decodeError-003.phpt b/tests/bson-corpus/dbpointer-decodeError-003.phpt index db856b5e7..fcd64f79e 100644 --- a/tests/bson-corpus/dbpointer-decodeError-003.phpt +++ b/tests/bson-corpus/dbpointer-decodeError-003.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('1A0000000C610002000000626256E1FC72E0C917E9C471416100'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/dbpointer-decodeError-004.phpt b/tests/bson-corpus/dbpointer-decodeError-004.phpt index 1e386ee01..33cc3d89d 100644 --- a/tests/bson-corpus/dbpointer-decodeError-004.phpt +++ b/tests/bson-corpus/dbpointer-decodeError-004.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('160000000C61000300000061620056E1FC72E0C91700'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/dbpointer-decodeError-005.phpt b/tests/bson-corpus/dbpointer-decodeError-005.phpt index a7a021a18..2c6650672 100644 --- a/tests/bson-corpus/dbpointer-decodeError-005.phpt +++ b/tests/bson-corpus/dbpointer-decodeError-005.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('1A0000000C61000300000061620056E1FC72E0C917E9C4716100'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/dbpointer-decodeError-006.phpt b/tests/bson-corpus/dbpointer-decodeError-006.phpt index 56d86fc77..9f46a9a55 100644 --- a/tests/bson-corpus/dbpointer-decodeError-006.phpt +++ b/tests/bson-corpus/dbpointer-decodeError-006.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('1A0000000C610002000000E90056E1FC72E0C917E9C471416100'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/dbpointer-valid-001.phpt b/tests/bson-corpus/dbpointer-valid-001.phpt index 3ded4d44c..c19b2c92d 100644 --- a/tests/bson-corpus/dbpointer-valid-001.phpt +++ b/tests/bson-corpus/dbpointer-valid-001.phpt @@ -14,21 +14,12 @@ $convertedBson = hex2bin('2a0000000361002200000002247265660002000000620007246964 $canonicalExtJson = '{"a": {"$dbPointer": {"$ref": "b", "$id": {"$oid": "56e1fc72e0c917e9c4714161"}}}}'; $convertedExtJson = '{"a": {"$ref": "b", "$id": {"$oid": "56e1fc72e0c917e9c4714161"}}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -37,9 +28,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1a0000000c610002000000620056e1fc72e0c917e9c471416100 -1a0000000c610002000000620056e1fc72e0c917e9c471416100 -{"a":{"$dbPointer":{"$ref":"b","$id":{"$oid":"56e1fc72e0c917e9c4714161"}}}} {"a":{"$dbPointer":{"$ref":"b","$id":{"$oid":"56e1fc72e0c917e9c4714161"}}}} 1a0000000c610002000000620056e1fc72e0c917e9c471416100 -1a0000000c610002000000620056e1fc72e0c917e9c471416100 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/dbpointer-valid-002.phpt b/tests/bson-corpus/dbpointer-valid-002.phpt index 5403bfae7..eda7fc359 100644 --- a/tests/bson-corpus/dbpointer-valid-002.phpt +++ b/tests/bson-corpus/dbpointer-valid-002.phpt @@ -15,27 +15,15 @@ $canonicalExtJson = '{"a": {"$dbPointer": {"$ref": "b", "$id": {"$oid": "56e1fc7 $degenerateExtJson = '{"a": {"$dbPointer": {"$id": {"$oid": "56e1fc72e0c917e9c4714161"}, "$ref": "b"}}}'; $convertedExtJson = '{"a": {"$ref": "b", "$id": {"$oid": "56e1fc72e0c917e9c4714161"}}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -44,11 +32,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 1a0000000c610002000000620056e1fc72e0c917e9c471416100 -1a0000000c610002000000620056e1fc72e0c917e9c471416100 -{"a":{"$dbPointer":{"$ref":"b","$id":{"$oid":"56e1fc72e0c917e9c4714161"}}}} {"a":{"$dbPointer":{"$ref":"b","$id":{"$oid":"56e1fc72e0c917e9c4714161"}}}} 1a0000000c610002000000620056e1fc72e0c917e9c471416100 1a0000000c610002000000620056e1fc72e0c917e9c471416100 -1a0000000c610002000000620056e1fc72e0c917e9c471416100 -1a0000000c610002000000620056e1fc72e0c917e9c471416100 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/dbpointer-valid-003.phpt b/tests/bson-corpus/dbpointer-valid-003.phpt index e29b75365..232d764e6 100644 --- a/tests/bson-corpus/dbpointer-valid-003.phpt +++ b/tests/bson-corpus/dbpointer-valid-003.phpt @@ -14,21 +14,12 @@ $convertedBson = hex2bin('2B0000000361002300000002247265660003000000C3A900072469 $canonicalExtJson = '{"a": {"$dbPointer": {"$ref": "é", "$id": {"$oid": "56e1fc72e0c917e9c4714161"}}}}'; $convertedExtJson = '{"a": {"$ref": "é", "$id": {"$oid": "56e1fc72e0c917e9c4714161"}}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -37,9 +28,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1b0000000c610003000000c3a90056e1fc72e0c917e9c471416100 -1b0000000c610003000000c3a90056e1fc72e0c917e9c471416100 -{"a":{"$dbPointer":{"$ref":"\u00e9","$id":{"$oid":"56e1fc72e0c917e9c4714161"}}}} {"a":{"$dbPointer":{"$ref":"\u00e9","$id":{"$oid":"56e1fc72e0c917e9c4714161"}}}} 1b0000000c610003000000c3a90056e1fc72e0c917e9c471416100 -1b0000000c610003000000c3a90056e1fc72e0c917e9c471416100 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/dbref-valid-001.phpt b/tests/bson-corpus/dbref-valid-001.phpt index 18966aba3..ce429fbfb 100644 --- a/tests/bson-corpus/dbref-valid-001.phpt +++ b/tests/bson-corpus/dbref-valid-001.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('37000000036462726566002b0000000224726566000b000000636f6c6c656374696f6e00072469640058921b3e6e32ab156a22b59e0000'); $canonicalExtJson = '{"dbref": {"$ref": "collection", "$id": {"$oid": "58921b3e6e32ab156a22b59e"}}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 37000000036462726566002b0000000224726566000b000000636f6c6c656374696f6e00072469640058921b3e6e32ab156a22b59e0000 -37000000036462726566002b0000000224726566000b000000636f6c6c656374696f6e00072469640058921b3e6e32ab156a22b59e0000 -{"dbref":{"$ref":"collection","$id":{"$oid":"58921b3e6e32ab156a22b59e"}}} {"dbref":{"$ref":"collection","$id":{"$oid":"58921b3e6e32ab156a22b59e"}}} 37000000036462726566002b0000000224726566000b000000636f6c6c656374696f6e00072469640058921b3e6e32ab156a22b59e0000 -37000000036462726566002b0000000224726566000b000000636f6c6c656374696f6e00072469640058921b3e6e32ab156a22b59e0000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/dbref-valid-002.phpt b/tests/bson-corpus/dbref-valid-002.phpt index ba60b80b4..1d55c0f6c 100644 --- a/tests/bson-corpus/dbref-valid-002.phpt +++ b/tests/bson-corpus/dbref-valid-002.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('4300000003646272656600370000000224726566000b000000636f6c6c656374696f6e00072469640058921b3e6e32ab156a22b59e0224646200030000006462000000'); $canonicalExtJson = '{"dbref": {"$ref": "collection", "$id": {"$oid": "58921b3e6e32ab156a22b59e"}, "$db": "db"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 4300000003646272656600370000000224726566000b000000636f6c6c656374696f6e00072469640058921b3e6e32ab156a22b59e0224646200030000006462000000 -4300000003646272656600370000000224726566000b000000636f6c6c656374696f6e00072469640058921b3e6e32ab156a22b59e0224646200030000006462000000 -{"dbref":{"$ref":"collection","$id":{"$oid":"58921b3e6e32ab156a22b59e"},"$db":"db"}} {"dbref":{"$ref":"collection","$id":{"$oid":"58921b3e6e32ab156a22b59e"},"$db":"db"}} 4300000003646272656600370000000224726566000b000000636f6c6c656374696f6e00072469640058921b3e6e32ab156a22b59e0224646200030000006462000000 -4300000003646272656600370000000224726566000b000000636f6c6c656374696f6e00072469640058921b3e6e32ab156a22b59e0224646200030000006462000000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/dbref-valid-003.phpt b/tests/bson-corpus/dbref-valid-003.phpt index 67678f01c..a10ce32e1 100644 --- a/tests/bson-corpus/dbref-valid-003.phpt +++ b/tests/bson-corpus/dbref-valid-003.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('48000000036462726566003c0000000224726566000b000000636f6c6c656374696f6e0010246964002a00000002246462000300000064620002666f6f0004000000626172000000'); $canonicalExtJson = '{"dbref": {"$ref": "collection", "$id": {"$numberInt": "42"}, "$db": "db", "foo": "bar"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 48000000036462726566003c0000000224726566000b000000636f6c6c656374696f6e0010246964002a00000002246462000300000064620002666f6f0004000000626172000000 -48000000036462726566003c0000000224726566000b000000636f6c6c656374696f6e0010246964002a00000002246462000300000064620002666f6f0004000000626172000000 -{"dbref":{"$ref":"collection","$id":{"$numberInt":"42"},"$db":"db","foo":"bar"}} {"dbref":{"$ref":"collection","$id":{"$numberInt":"42"},"$db":"db","foo":"bar"}} 48000000036462726566003c0000000224726566000b000000636f6c6c656374696f6e0010246964002a00000002246462000300000064620002666f6f0004000000626172000000 -48000000036462726566003c0000000224726566000b000000636f6c6c656374696f6e0010246964002a00000002246462000300000064620002666f6f0004000000626172000000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/dbref-valid-004.phpt b/tests/bson-corpus/dbref-valid-004.phpt index 9588d8c5a..3287afa97 100644 --- a/tests/bson-corpus/dbref-valid-004.phpt +++ b/tests/bson-corpus/dbref-valid-004.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('4400000003646272656600380000000224726566000b000000636f6c6c656374696f6e00072469640058921b3e6e32ab156a22b59e02666f6f0004000000626172000000'); $canonicalExtJson = '{"dbref": {"$ref": "collection", "$id": {"$oid": "58921b3e6e32ab156a22b59e"}, "foo": "bar"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 4400000003646272656600380000000224726566000b000000636f6c6c656374696f6e00072469640058921b3e6e32ab156a22b59e02666f6f0004000000626172000000 -4400000003646272656600380000000224726566000b000000636f6c6c656374696f6e00072469640058921b3e6e32ab156a22b59e02666f6f0004000000626172000000 -{"dbref":{"$ref":"collection","$id":{"$oid":"58921b3e6e32ab156a22b59e"},"foo":"bar"}} {"dbref":{"$ref":"collection","$id":{"$oid":"58921b3e6e32ab156a22b59e"},"foo":"bar"}} 4400000003646272656600380000000224726566000b000000636f6c6c656374696f6e00072469640058921b3e6e32ab156a22b59e02666f6f0004000000626172000000 -4400000003646272656600380000000224726566000b000000636f6c6c656374696f6e00072469640058921b3e6e32ab156a22b59e02666f6f0004000000626172000000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/dbref-valid-005.phpt b/tests/bson-corpus/dbref-valid-005.phpt index 1fd98e29d..1cedad2af 100644 --- a/tests/bson-corpus/dbref-valid-005.phpt +++ b/tests/bson-corpus/dbref-valid-005.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('3e0000000224726566000c0000006e6f742d612d646272656600072469640058921b3e6e32ab156a22b59e022462616e616e6100050000007065656c0000'); $canonicalExtJson = '{"$ref": "not-a-dbref", "$id": {"$oid": "58921b3e6e32ab156a22b59e"}, "$banana": "peel"}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 3e0000000224726566000c0000006e6f742d612d646272656600072469640058921b3e6e32ab156a22b59e022462616e616e6100050000007065656c0000 -3e0000000224726566000c0000006e6f742d612d646272656600072469640058921b3e6e32ab156a22b59e022462616e616e6100050000007065656c0000 -{"$ref":"not-a-dbref","$id":{"$oid":"58921b3e6e32ab156a22b59e"},"$banana":"peel"} {"$ref":"not-a-dbref","$id":{"$oid":"58921b3e6e32ab156a22b59e"},"$banana":"peel"} 3e0000000224726566000c0000006e6f742d612d646272656600072469640058921b3e6e32ab156a22b59e022462616e616e6100050000007065656c0000 -3e0000000224726566000c0000006e6f742d612d646272656600072469640058921b3e6e32ab156a22b59e022462616e616e6100050000007065656c0000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/dbref-valid-006.phpt b/tests/bson-corpus/dbref-valid-006.phpt index 90637130a..8876977ee 100644 --- a/tests/bson-corpus/dbref-valid-006.phpt +++ b/tests/bson-corpus/dbref-valid-006.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('48000000036462726566003c0000000224726566000b000000636f6c6c656374696f6e00072469640058921b3e6e32ab156a22b59e10612e62000100000010246300010000000000'); $canonicalExtJson = '{"dbref": {"$ref": "collection", "$id": {"$oid": "58921b3e6e32ab156a22b59e"}, "a.b": {"$numberInt": "1"}, "$c": {"$numberInt": "1"}}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 48000000036462726566003c0000000224726566000b000000636f6c6c656374696f6e00072469640058921b3e6e32ab156a22b59e10612e62000100000010246300010000000000 -48000000036462726566003c0000000224726566000b000000636f6c6c656374696f6e00072469640058921b3e6e32ab156a22b59e10612e62000100000010246300010000000000 -{"dbref":{"$ref":"collection","$id":{"$oid":"58921b3e6e32ab156a22b59e"},"a.b":{"$numberInt":"1"},"$c":{"$numberInt":"1"}}} {"dbref":{"$ref":"collection","$id":{"$oid":"58921b3e6e32ab156a22b59e"},"a.b":{"$numberInt":"1"},"$c":{"$numberInt":"1"}}} 48000000036462726566003c0000000224726566000b000000636f6c6c656374696f6e00072469640058921b3e6e32ab156a22b59e10612e62000100000010246300010000000000 -48000000036462726566003c0000000224726566000b000000636f6c6c656374696f6e00072469640058921b3e6e32ab156a22b59e10612e62000100000010246300010000000000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/dbref-valid-007.phpt b/tests/bson-corpus/dbref-valid-007.phpt index 81663ff1b..b9723341f 100644 --- a/tests/bson-corpus/dbref-valid-007.phpt +++ b/tests/bson-corpus/dbref-valid-007.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('26000000036462726566001a0000000224726566000b000000636f6c6c656374696f6e000000'); $canonicalExtJson = '{"dbref": {"$ref": "collection"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 26000000036462726566001a0000000224726566000b000000636f6c6c656374696f6e000000 -26000000036462726566001a0000000224726566000b000000636f6c6c656374696f6e000000 -{"dbref":{"$ref":"collection"}} {"dbref":{"$ref":"collection"}} 26000000036462726566001a0000000224726566000b000000636f6c6c656374696f6e000000 -26000000036462726566001a0000000224726566000b000000636f6c6c656374696f6e000000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/dbref-valid-008.phpt b/tests/bson-corpus/dbref-valid-008.phpt index f4d6b3808..229ddfc40 100644 --- a/tests/bson-corpus/dbref-valid-008.phpt +++ b/tests/bson-corpus/dbref-valid-008.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('2c000000036462726566002000000010247265660001000000072469640058921b3e6e32ab156a22b59e0000'); $canonicalExtJson = '{"dbref": {"$ref": {"$numberInt": "1"}, "$id": {"$oid": "58921b3e6e32ab156a22b59e"}}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 2c000000036462726566002000000010247265660001000000072469640058921b3e6e32ab156a22b59e0000 -2c000000036462726566002000000010247265660001000000072469640058921b3e6e32ab156a22b59e0000 -{"dbref":{"$ref":{"$numberInt":"1"},"$id":{"$oid":"58921b3e6e32ab156a22b59e"}}} {"dbref":{"$ref":{"$numberInt":"1"},"$id":{"$oid":"58921b3e6e32ab156a22b59e"}}} 2c000000036462726566002000000010247265660001000000072469640058921b3e6e32ab156a22b59e0000 -2c000000036462726566002000000010247265660001000000072469640058921b3e6e32ab156a22b59e0000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/dbref-valid-009.phpt b/tests/bson-corpus/dbref-valid-009.phpt index a8035c501..cb2cc1eaa 100644 --- a/tests/bson-corpus/dbref-valid-009.phpt +++ b/tests/bson-corpus/dbref-valid-009.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('4000000003646272656600340000000224726566000b000000636f6c6c656374696f6e00072469640058921b3e6e32ab156a22b59e1024646200010000000000'); $canonicalExtJson = '{"dbref": {"$ref": "collection", "$id": {"$oid": "58921b3e6e32ab156a22b59e"}, "$db": {"$numberInt": "1"}}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 4000000003646272656600340000000224726566000b000000636f6c6c656374696f6e00072469640058921b3e6e32ab156a22b59e1024646200010000000000 -4000000003646272656600340000000224726566000b000000636f6c6c656374696f6e00072469640058921b3e6e32ab156a22b59e1024646200010000000000 -{"dbref":{"$ref":"collection","$id":{"$oid":"58921b3e6e32ab156a22b59e"},"$db":{"$numberInt":"1"}}} {"dbref":{"$ref":"collection","$id":{"$oid":"58921b3e6e32ab156a22b59e"},"$db":{"$numberInt":"1"}}} 4000000003646272656600340000000224726566000b000000636f6c6c656374696f6e00072469640058921b3e6e32ab156a22b59e1024646200010000000000 -4000000003646272656600340000000224726566000b000000636f6c6c656374696f6e00072469640058921b3e6e32ab156a22b59e1024646200010000000000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-1-valid-001.phpt b/tests/bson-corpus/decimal128-1-valid-001.phpt index f9c446685..75c466645 100644 --- a/tests/bson-corpus/decimal128-1-valid-001.phpt +++ b/tests/bson-corpus/decimal128-1-valid-001.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000000000000000000000000000000007C00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "NaN"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000000000000000000000000000000007c00 -180000001364000000000000000000000000000000007c00 -{"d":{"$numberDecimal":"NaN"}} {"d":{"$numberDecimal":"NaN"}} 180000001364000000000000000000000000000000007c00 -180000001364000000000000000000000000000000007c00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-1-valid-002.phpt b/tests/bson-corpus/decimal128-1-valid-002.phpt index 6fef84f96..0f8f88f90 100644 --- a/tests/bson-corpus/decimal128-1-valid-002.phpt +++ b/tests/bson-corpus/decimal128-1-valid-002.phpt @@ -12,15 +12,9 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400000000000000000000000000000000FC00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "NaN"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; @@ -29,7 +23,5 @@ echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanoni --EXPECT-- 18000000136400000000000000000000000000000000fc00 -18000000136400000000000000000000000000000000fc00 -{"d":{"$numberDecimal":"NaN"}} {"d":{"$numberDecimal":"NaN"}} ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-1-valid-003.phpt b/tests/bson-corpus/decimal128-1-valid-003.phpt index 6dfd3644d..8e8800f4f 100644 --- a/tests/bson-corpus/decimal128-1-valid-003.phpt +++ b/tests/bson-corpus/decimal128-1-valid-003.phpt @@ -13,15 +13,9 @@ $canonicalBson = hex2bin('18000000136400000000000000000000000000000000FC00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "NaN"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "-NaN"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; @@ -30,7 +24,5 @@ echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanoni --EXPECT-- 18000000136400000000000000000000000000000000fc00 -18000000136400000000000000000000000000000000fc00 -{"d":{"$numberDecimal":"NaN"}} {"d":{"$numberDecimal":"NaN"}} ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-1-valid-004.phpt b/tests/bson-corpus/decimal128-1-valid-004.phpt index 94e78a91c..81b6bd245 100644 --- a/tests/bson-corpus/decimal128-1-valid-004.phpt +++ b/tests/bson-corpus/decimal128-1-valid-004.phpt @@ -12,15 +12,9 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000000000000000000000000000000007E00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "NaN"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; @@ -29,7 +23,5 @@ echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanoni --EXPECT-- 180000001364000000000000000000000000000000007e00 -180000001364000000000000000000000000000000007e00 -{"d":{"$numberDecimal":"NaN"}} {"d":{"$numberDecimal":"NaN"}} ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-1-valid-005.phpt b/tests/bson-corpus/decimal128-1-valid-005.phpt index 0c99a15c5..b19f56a3e 100644 --- a/tests/bson-corpus/decimal128-1-valid-005.phpt +++ b/tests/bson-corpus/decimal128-1-valid-005.phpt @@ -12,15 +12,9 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400000000000000000000000000000000FE00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "NaN"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; @@ -29,7 +23,5 @@ echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanoni --EXPECT-- 18000000136400000000000000000000000000000000fe00 -18000000136400000000000000000000000000000000fe00 -{"d":{"$numberDecimal":"NaN"}} {"d":{"$numberDecimal":"NaN"}} ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-1-valid-006.phpt b/tests/bson-corpus/decimal128-1-valid-006.phpt index 1d47e1472..0f921841f 100644 --- a/tests/bson-corpus/decimal128-1-valid-006.phpt +++ b/tests/bson-corpus/decimal128-1-valid-006.phpt @@ -12,15 +12,9 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364001200000000000000000000000000007E00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "NaN"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; @@ -29,7 +23,5 @@ echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanoni --EXPECT-- 180000001364001200000000000000000000000000007e00 -180000001364001200000000000000000000000000007e00 -{"d":{"$numberDecimal":"NaN"}} {"d":{"$numberDecimal":"NaN"}} ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-1-valid-007.phpt b/tests/bson-corpus/decimal128-1-valid-007.phpt index 91c302d3a..5b47e5979 100644 --- a/tests/bson-corpus/decimal128-1-valid-007.phpt +++ b/tests/bson-corpus/decimal128-1-valid-007.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000000000000000000000000000000007800'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "Infinity"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000000000000000000000000000000007800 -180000001364000000000000000000000000000000007800 -{"d":{"$numberDecimal":"Infinity"}} {"d":{"$numberDecimal":"Infinity"}} 180000001364000000000000000000000000000000007800 -180000001364000000000000000000000000000000007800 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-1-valid-008.phpt b/tests/bson-corpus/decimal128-1-valid-008.phpt index 935d73980..7bc5e0871 100644 --- a/tests/bson-corpus/decimal128-1-valid-008.phpt +++ b/tests/bson-corpus/decimal128-1-valid-008.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400000000000000000000000000000000F800'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-Infinity"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400000000000000000000000000000000f800 -18000000136400000000000000000000000000000000f800 -{"d":{"$numberDecimal":"-Infinity"}} {"d":{"$numberDecimal":"-Infinity"}} 18000000136400000000000000000000000000000000f800 -18000000136400000000000000000000000000000000f800 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-1-valid-009.phpt b/tests/bson-corpus/decimal128-1-valid-009.phpt index ed0bfa3d4..4b8a00318 100644 --- a/tests/bson-corpus/decimal128-1-valid-009.phpt +++ b/tests/bson-corpus/decimal128-1-valid-009.phpt @@ -12,15 +12,9 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000000000000000000000000000000106C00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; @@ -29,7 +23,5 @@ echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanoni --EXPECT-- 180000001364000000000000000000000000000000106c00 -180000001364000000000000000000000000000000106c00 -{"d":{"$numberDecimal":"0"}} {"d":{"$numberDecimal":"0"}} ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-1-valid-010.phpt b/tests/bson-corpus/decimal128-1-valid-010.phpt index 13671cac9..eaea1102c 100644 --- a/tests/bson-corpus/decimal128-1-valid-010.phpt +++ b/tests/bson-corpus/decimal128-1-valid-010.phpt @@ -12,15 +12,9 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400DCBA9876543210DEADBEEF00000010EC00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-0"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; @@ -29,7 +23,5 @@ echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanoni --EXPECT-- 18000000136400dcba9876543210deadbeef00000010ec00 -18000000136400dcba9876543210deadbeef00000010ec00 -{"d":{"$numberDecimal":"-0"}} {"d":{"$numberDecimal":"-0"}} ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-1-valid-011.phpt b/tests/bson-corpus/decimal128-1-valid-011.phpt index c8240055f..500eb1464 100644 --- a/tests/bson-corpus/decimal128-1-valid-011.phpt +++ b/tests/bson-corpus/decimal128-1-valid-011.phpt @@ -12,15 +12,9 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400FFFFFFFFFFFFFFFFFFFFFFFFFFFF116C00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0E+3"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; @@ -29,7 +23,5 @@ echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanoni --EXPECT-- 18000000136400ffffffffffffffffffffffffffff116c00 -18000000136400ffffffffffffffffffffffffffff116c00 -{"d":{"$numberDecimal":"0E+3"}} {"d":{"$numberDecimal":"0E+3"}} ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-1-valid-012.phpt b/tests/bson-corpus/decimal128-1-valid-012.phpt index 6be68b9d0..6c49c531f 100644 --- a/tests/bson-corpus/decimal128-1-valid-012.phpt +++ b/tests/bson-corpus/decimal128-1-valid-012.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400F2AF967ED05C82DE3297FF6FDE3CF22F00'); $canonicalExtJson = '{"d": { "$numberDecimal": "0.000001234567890123456789012345678901234" }}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400f2af967ed05c82de3297ff6fde3cf22f00 -18000000136400f2af967ed05c82de3297ff6fde3cf22f00 -{"d":{"$numberDecimal":"0.000001234567890123456789012345678901234"}} {"d":{"$numberDecimal":"0.000001234567890123456789012345678901234"}} 18000000136400f2af967ed05c82de3297ff6fde3cf22f00 -18000000136400f2af967ed05c82de3297ff6fde3cf22f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-1-valid-013.phpt b/tests/bson-corpus/decimal128-1-valid-013.phpt index 8020e7f6b..3fc39ff85 100644 --- a/tests/bson-corpus/decimal128-1-valid-013.phpt +++ b/tests/bson-corpus/decimal128-1-valid-013.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400D204000000000000000000000000343000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.001234"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400d204000000000000000000000000343000 -18000000136400d204000000000000000000000000343000 -{"d":{"$numberDecimal":"0.001234"}} {"d":{"$numberDecimal":"0.001234"}} 18000000136400d204000000000000000000000000343000 -18000000136400d204000000000000000000000000343000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-1-valid-014.phpt b/tests/bson-corpus/decimal128-1-valid-014.phpt index a2b36b09a..402eeed87 100644 --- a/tests/bson-corpus/decimal128-1-valid-014.phpt +++ b/tests/bson-corpus/decimal128-1-valid-014.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1800000013640040EF5A07000000000000000000002A3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.00123400000"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1800000013640040ef5a07000000000000000000002a3000 -1800000013640040ef5a07000000000000000000002a3000 -{"d":{"$numberDecimal":"0.00123400000"}} {"d":{"$numberDecimal":"0.00123400000"}} 1800000013640040ef5a07000000000000000000002a3000 -1800000013640040ef5a07000000000000000000002a3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-1-valid-015.phpt b/tests/bson-corpus/decimal128-1-valid-015.phpt index dae362cb8..fa16fce82 100644 --- a/tests/bson-corpus/decimal128-1-valid-015.phpt +++ b/tests/bson-corpus/decimal128-1-valid-015.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1800000013640001000000000000000000000000003E3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.1"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1800000013640001000000000000000000000000003e3000 -1800000013640001000000000000000000000000003e3000 -{"d":{"$numberDecimal":"0.1"}} {"d":{"$numberDecimal":"0.1"}} 1800000013640001000000000000000000000000003e3000 -1800000013640001000000000000000000000000003e3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-1-valid-016.phpt b/tests/bson-corpus/decimal128-1-valid-016.phpt index bba4aa844..0ef4aa95e 100644 --- a/tests/bson-corpus/decimal128-1-valid-016.phpt +++ b/tests/bson-corpus/decimal128-1-valid-016.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400F2AF967ED05C82DE3297FF6FDE3CFC2F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.1234567890123456789012345678901234"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400f2af967ed05c82de3297ff6fde3cfc2f00 -18000000136400f2af967ed05c82de3297ff6fde3cfc2f00 -{"d":{"$numberDecimal":"0.1234567890123456789012345678901234"}} {"d":{"$numberDecimal":"0.1234567890123456789012345678901234"}} 18000000136400f2af967ed05c82de3297ff6fde3cfc2f00 -18000000136400f2af967ed05c82de3297ff6fde3cfc2f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-1-valid-017.phpt b/tests/bson-corpus/decimal128-1-valid-017.phpt index e9d8f118f..4a14f0fe0 100644 --- a/tests/bson-corpus/decimal128-1-valid-017.phpt +++ b/tests/bson-corpus/decimal128-1-valid-017.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000000000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000000000000000000000000000000403000 -180000001364000000000000000000000000000000403000 -{"d":{"$numberDecimal":"0"}} {"d":{"$numberDecimal":"0"}} 180000001364000000000000000000000000000000403000 -180000001364000000000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-1-valid-018.phpt b/tests/bson-corpus/decimal128-1-valid-018.phpt index 69df36c3f..191ffbcfe 100644 --- a/tests/bson-corpus/decimal128-1-valid-018.phpt +++ b/tests/bson-corpus/decimal128-1-valid-018.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400000000000000000000000000000040B000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-0"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400000000000000000000000000000040b000 -18000000136400000000000000000000000000000040b000 -{"d":{"$numberDecimal":"-0"}} {"d":{"$numberDecimal":"-0"}} 18000000136400000000000000000000000000000040b000 -18000000136400000000000000000000000000000040b000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-1-valid-019.phpt b/tests/bson-corpus/decimal128-1-valid-019.phpt index e8073b4e0..a74fc4ed5 100644 --- a/tests/bson-corpus/decimal128-1-valid-019.phpt +++ b/tests/bson-corpus/decimal128-1-valid-019.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1800000013640000000000000000000000000000003EB000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-0.0"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1800000013640000000000000000000000000000003eb000 -1800000013640000000000000000000000000000003eb000 -{"d":{"$numberDecimal":"-0.0"}} {"d":{"$numberDecimal":"-0.0"}} 1800000013640000000000000000000000000000003eb000 -1800000013640000000000000000000000000000003eb000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-1-valid-020.phpt b/tests/bson-corpus/decimal128-1-valid-020.phpt index ed5c3c03c..957037f64 100644 --- a/tests/bson-corpus/decimal128-1-valid-020.phpt +++ b/tests/bson-corpus/decimal128-1-valid-020.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000200000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "2"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000200000000000000000000000000403000 -180000001364000200000000000000000000000000403000 -{"d":{"$numberDecimal":"2"}} {"d":{"$numberDecimal":"2"}} 180000001364000200000000000000000000000000403000 -180000001364000200000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-1-valid-021.phpt b/tests/bson-corpus/decimal128-1-valid-021.phpt index 240b65998..3706746be 100644 --- a/tests/bson-corpus/decimal128-1-valid-021.phpt +++ b/tests/bson-corpus/decimal128-1-valid-021.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400D0070000000000000000000000003A3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "2.000"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400d0070000000000000000000000003a3000 -18000000136400d0070000000000000000000000003a3000 -{"d":{"$numberDecimal":"2.000"}} {"d":{"$numberDecimal":"2.000"}} 18000000136400d0070000000000000000000000003a3000 -18000000136400d0070000000000000000000000003a3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-1-valid-022.phpt b/tests/bson-corpus/decimal128-1-valid-022.phpt index ed45b6b2c..24b9d5566 100644 --- a/tests/bson-corpus/decimal128-1-valid-022.phpt +++ b/tests/bson-corpus/decimal128-1-valid-022.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400F2AF967ED05C82DE3297FF6FDE3C403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1234567890123456789012345678901234"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400f2af967ed05c82de3297ff6fde3c403000 -18000000136400f2af967ed05c82de3297ff6fde3c403000 -{"d":{"$numberDecimal":"1234567890123456789012345678901234"}} {"d":{"$numberDecimal":"1234567890123456789012345678901234"}} 18000000136400f2af967ed05c82de3297ff6fde3c403000 -18000000136400f2af967ed05c82de3297ff6fde3c403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-1-valid-023.phpt b/tests/bson-corpus/decimal128-1-valid-023.phpt index a95f128f3..f75444a49 100644 --- a/tests/bson-corpus/decimal128-1-valid-023.phpt +++ b/tests/bson-corpus/decimal128-1-valid-023.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400FFFFFFFF638E8D37C087ADBE09ED010000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "9.999999999999999999999999999999999E-6143"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400ffffffff638e8d37c087adbe09ed010000 -18000000136400ffffffff638e8d37c087adbe09ed010000 -{"d":{"$numberDecimal":"9.999999999999999999999999999999999E-6143"}} {"d":{"$numberDecimal":"9.999999999999999999999999999999999E-6143"}} 18000000136400ffffffff638e8d37c087adbe09ed010000 -18000000136400ffffffff638e8d37c087adbe09ed010000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-1-valid-024.phpt b/tests/bson-corpus/decimal128-1-valid-024.phpt index 0b6764dd9..e15db1466 100644 --- a/tests/bson-corpus/decimal128-1-valid-024.phpt +++ b/tests/bson-corpus/decimal128-1-valid-024.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000100000000000000000000000000000000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1E-6176"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000100000000000000000000000000000000 -180000001364000100000000000000000000000000000000 -{"d":{"$numberDecimal":"1E-6176"}} {"d":{"$numberDecimal":"1E-6176"}} 180000001364000100000000000000000000000000000000 -180000001364000100000000000000000000000000000000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-1-valid-025.phpt b/tests/bson-corpus/decimal128-1-valid-025.phpt index 2311d1c1b..887ef8520 100644 --- a/tests/bson-corpus/decimal128-1-valid-025.phpt +++ b/tests/bson-corpus/decimal128-1-valid-025.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000100000000000000000000000000008000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-1E-6176"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000100000000000000000000000000008000 -180000001364000100000000000000000000000000008000 -{"d":{"$numberDecimal":"-1E-6176"}} {"d":{"$numberDecimal":"-1E-6176"}} 180000001364000100000000000000000000000000008000 -180000001364000100000000000000000000000000008000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-1-valid-026.phpt b/tests/bson-corpus/decimal128-1-valid-026.phpt index 10e22129e..ec814817c 100644 --- a/tests/bson-corpus/decimal128-1-valid-026.phpt +++ b/tests/bson-corpus/decimal128-1-valid-026.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400F2AF967ED05C82DE3297FF6FDE3CF02F00'); $canonicalExtJson = '{"d": { "$numberDecimal": "1.234567890123456789012345678901234E-7" }}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400f2af967ed05c82de3297ff6fde3cf02f00 -18000000136400f2af967ed05c82de3297ff6fde3cf02f00 -{"d":{"$numberDecimal":"1.234567890123456789012345678901234E-7"}} {"d":{"$numberDecimal":"1.234567890123456789012345678901234E-7"}} 18000000136400f2af967ed05c82de3297ff6fde3cf02f00 -18000000136400f2af967ed05c82de3297ff6fde3cf02f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-1-valid-027.phpt b/tests/bson-corpus/decimal128-1-valid-027.phpt index bb077952e..2b4d2ca06 100644 --- a/tests/bson-corpus/decimal128-1-valid-027.phpt +++ b/tests/bson-corpus/decimal128-1-valid-027.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1800000013640064000000000000000000000000002CB000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-1.00E-8"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1800000013640064000000000000000000000000002cb000 -1800000013640064000000000000000000000000002cb000 -{"d":{"$numberDecimal":"-1.00E-8"}} {"d":{"$numberDecimal":"-1.00E-8"}} 1800000013640064000000000000000000000000002cb000 -1800000013640064000000000000000000000000002cb000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-1-valid-028.phpt b/tests/bson-corpus/decimal128-1-valid-028.phpt index 8e36088ee..19c2572f9 100644 --- a/tests/bson-corpus/decimal128-1-valid-028.phpt +++ b/tests/bson-corpus/decimal128-1-valid-028.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000000000000000000000000000000205F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0E+6000"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000000000000000000000000000000205f00 -180000001364000000000000000000000000000000205f00 -{"d":{"$numberDecimal":"0E+6000"}} {"d":{"$numberDecimal":"0E+6000"}} 180000001364000000000000000000000000000000205f00 -180000001364000000000000000000000000000000205f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-1-valid-029.phpt b/tests/bson-corpus/decimal128-1-valid-029.phpt index 1b31afaf6..54518d1e0 100644 --- a/tests/bson-corpus/decimal128-1-valid-029.phpt +++ b/tests/bson-corpus/decimal128-1-valid-029.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1800000013640000000000000000000000000000007A2B00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0E-611"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1800000013640000000000000000000000000000007a2b00 -1800000013640000000000000000000000000000007a2b00 -{"d":{"$numberDecimal":"0E-611"}} {"d":{"$numberDecimal":"0E-611"}} 1800000013640000000000000000000000000000007a2b00 -1800000013640000000000000000000000000000007a2b00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-1-valid-030.phpt b/tests/bson-corpus/decimal128-1-valid-030.phpt index eb9d703cd..dae4dce5f 100644 --- a/tests/bson-corpus/decimal128-1-valid-030.phpt +++ b/tests/bson-corpus/decimal128-1-valid-030.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000100000000000000000000000000463000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1E+3"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000100000000000000000000000000463000 -180000001364000100000000000000000000000000463000 -{"d":{"$numberDecimal":"1E+3"}} {"d":{"$numberDecimal":"1E+3"}} 180000001364000100000000000000000000000000463000 -180000001364000100000000000000000000000000463000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-1-valid-031.phpt b/tests/bson-corpus/decimal128-1-valid-031.phpt index a34854799..a7e96ebc1 100644 --- a/tests/bson-corpus/decimal128-1-valid-031.phpt +++ b/tests/bson-corpus/decimal128-1-valid-031.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364001A04000000000000000000000000423000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.050E+4"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364001a04000000000000000000000000423000 -180000001364001a04000000000000000000000000423000 -{"d":{"$numberDecimal":"1.050E+4"}} {"d":{"$numberDecimal":"1.050E+4"}} 180000001364001a04000000000000000000000000423000 -180000001364001a04000000000000000000000000423000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-1-valid-032.phpt b/tests/bson-corpus/decimal128-1-valid-032.phpt index fbde1c24d..be5e39445 100644 --- a/tests/bson-corpus/decimal128-1-valid-032.phpt +++ b/tests/bson-corpus/decimal128-1-valid-032.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364006900000000000000000000000000423000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.05E+3"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364006900000000000000000000000000423000 -180000001364006900000000000000000000000000423000 -{"d":{"$numberDecimal":"1.05E+3"}} {"d":{"$numberDecimal":"1.05E+3"}} 180000001364006900000000000000000000000000423000 -180000001364006900000000000000000000000000423000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-1-valid-033.phpt b/tests/bson-corpus/decimal128-1-valid-033.phpt index 49b934217..2c2a78ad6 100644 --- a/tests/bson-corpus/decimal128-1-valid-033.phpt +++ b/tests/bson-corpus/decimal128-1-valid-033.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400FFFFFFFFFFFFFFFFFFFFFFFFFFFF403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "5192296858534827628530496329220095"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400ffffffffffffffffffffffffffff403000 -18000000136400ffffffffffffffffffffffffffff403000 -{"d":{"$numberDecimal":"5192296858534827628530496329220095"}} {"d":{"$numberDecimal":"5192296858534827628530496329220095"}} 18000000136400ffffffffffffffffffffffffffff403000 -18000000136400ffffffffffffffffffffffffffff403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-1-valid-034.phpt b/tests/bson-corpus/decimal128-1-valid-034.phpt index 7db9099a4..3b7ea52f7 100644 --- a/tests/bson-corpus/decimal128-1-valid-034.phpt +++ b/tests/bson-corpus/decimal128-1-valid-034.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400000000000A5BC138938D44C64D31FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.000000000000000000000000000000000E+6144"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400000000000a5bc138938d44c64d31fe5f00 -18000000136400000000000a5bc138938d44c64d31fe5f00 -{"d":{"$numberDecimal":"1.000000000000000000000000000000000E+6144"}} {"d":{"$numberDecimal":"1.000000000000000000000000000000000E+6144"}} 18000000136400000000000a5bc138938d44c64d31fe5f00 -18000000136400000000000a5bc138938d44c64d31fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-1-valid-035.phpt b/tests/bson-corpus/decimal128-1-valid-035.phpt index f9f3ea270..58838451a 100644 --- a/tests/bson-corpus/decimal128-1-valid-035.phpt +++ b/tests/bson-corpus/decimal128-1-valid-035.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400FFFFFFFF638E8D37C087ADBE09EDFF5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "9.999999999999999999999999999999999E+6144"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400ffffffff638e8d37c087adbe09edff5f00 -18000000136400ffffffff638e8d37c087adbe09edff5f00 -{"d":{"$numberDecimal":"9.999999999999999999999999999999999E+6144"}} {"d":{"$numberDecimal":"9.999999999999999999999999999999999E+6144"}} 18000000136400ffffffff638e8d37c087adbe09edff5f00 -18000000136400ffffffff638e8d37c087adbe09edff5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-1-valid-036.phpt b/tests/bson-corpus/decimal128-1-valid-036.phpt index 9ec1b2bc4..d0ddda9f1 100644 --- a/tests/bson-corpus/decimal128-1-valid-036.phpt +++ b/tests/bson-corpus/decimal128-1-valid-036.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('1800000013640064000000000000000000000000002CB000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-1.00E-8"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "-100E-10"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 1800000013640064000000000000000000000000002cb000 -1800000013640064000000000000000000000000002cb000 -{"d":{"$numberDecimal":"-1.00E-8"}} {"d":{"$numberDecimal":"-1.00E-8"}} 1800000013640064000000000000000000000000002cb000 1800000013640064000000000000000000000000002cb000 -1800000013640064000000000000000000000000002cb000 -1800000013640064000000000000000000000000002cb000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-1-valid-037.phpt b/tests/bson-corpus/decimal128-1-valid-037.phpt index 2cf40ac99..8ac5fb3dd 100644 --- a/tests/bson-corpus/decimal128-1-valid-037.phpt +++ b/tests/bson-corpus/decimal128-1-valid-037.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000100000000000000000000000000463000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1E+3"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1E3"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000100000000000000000000000000463000 -180000001364000100000000000000000000000000463000 -{"d":{"$numberDecimal":"1E+3"}} {"d":{"$numberDecimal":"1E+3"}} 180000001364000100000000000000000000000000463000 180000001364000100000000000000000000000000463000 -180000001364000100000000000000000000000000463000 -180000001364000100000000000000000000000000463000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-1-valid-038.phpt b/tests/bson-corpus/decimal128-1-valid-038.phpt index d6430d4b2..21ab83d24 100644 --- a/tests/bson-corpus/decimal128-1-valid-038.phpt +++ b/tests/bson-corpus/decimal128-1-valid-038.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000100000000000000000000000000463000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1E+3"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1e+3"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000100000000000000000000000000463000 -180000001364000100000000000000000000000000463000 -{"d":{"$numberDecimal":"1E+3"}} {"d":{"$numberDecimal":"1E+3"}} 180000001364000100000000000000000000000000463000 180000001364000100000000000000000000000000463000 -180000001364000100000000000000000000000000463000 -180000001364000100000000000000000000000000463000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-1-valid-039.phpt b/tests/bson-corpus/decimal128-1-valid-039.phpt index 0fbfcafc5..6d8739b77 100644 --- a/tests/bson-corpus/decimal128-1-valid-039.phpt +++ b/tests/bson-corpus/decimal128-1-valid-039.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('1800000013640079D9E0F9763ADA429D0200000000583000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.2345689012345789012345E+34"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "12345689012345789012345E+12"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 1800000013640079d9e0f9763ada429d0200000000583000 -1800000013640079d9e0f9763ada429d0200000000583000 -{"d":{"$numberDecimal":"1.2345689012345789012345E+34"}} {"d":{"$numberDecimal":"1.2345689012345789012345E+34"}} 1800000013640079d9e0f9763ada429d0200000000583000 1800000013640079d9e0f9763ada429d0200000000583000 -1800000013640079d9e0f9763ada429d0200000000583000 -1800000013640079d9e0f9763ada429d0200000000583000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-1-valid-040.phpt b/tests/bson-corpus/decimal128-1-valid-040.phpt index 4d0e8070d..a07465eba 100644 --- a/tests/bson-corpus/decimal128-1-valid-040.phpt +++ b/tests/bson-corpus/decimal128-1-valid-040.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F2AF967ED05C82DE3297FF6FDE3C403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1234567890123456789012345678901234"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "+1234567890123456789012345678901234"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f2af967ed05c82de3297ff6fde3c403000 -18000000136400f2af967ed05c82de3297ff6fde3c403000 -{"d":{"$numberDecimal":"1234567890123456789012345678901234"}} {"d":{"$numberDecimal":"1234567890123456789012345678901234"}} 18000000136400f2af967ed05c82de3297ff6fde3c403000 18000000136400f2af967ed05c82de3297ff6fde3c403000 -18000000136400f2af967ed05c82de3297ff6fde3c403000 -18000000136400f2af967ed05c82de3297ff6fde3c403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-1-valid-041.phpt b/tests/bson-corpus/decimal128-1-valid-041.phpt index 4835cf83e..14df4b60f 100644 --- a/tests/bson-corpus/decimal128-1-valid-041.phpt +++ b/tests/bson-corpus/decimal128-1-valid-041.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000100000000000000000000000000722800'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1E-999"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : ".000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000100000000000000000000000000722800 -180000001364000100000000000000000000000000722800 -{"d":{"$numberDecimal":"1E-999"}} {"d":{"$numberDecimal":"1E-999"}} 180000001364000100000000000000000000000000722800 180000001364000100000000000000000000000000722800 -180000001364000100000000000000000000000000722800 -180000001364000100000000000000000000000000722800 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-1-valid-042.phpt b/tests/bson-corpus/decimal128-1-valid-042.phpt index d0e461df4..255a3b65a 100644 --- a/tests/bson-corpus/decimal128-1-valid-042.phpt +++ b/tests/bson-corpus/decimal128-1-valid-042.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000007C00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "NaN"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "nan"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000007c00 -180000001364000000000000000000000000000000007c00 -{"d":{"$numberDecimal":"NaN"}} {"d":{"$numberDecimal":"NaN"}} 180000001364000000000000000000000000000000007c00 180000001364000000000000000000000000000000007c00 -180000001364000000000000000000000000000000007c00 -180000001364000000000000000000000000000000007c00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-1-valid-043.phpt b/tests/bson-corpus/decimal128-1-valid-043.phpt index 199626dcc..df6f2fdb6 100644 --- a/tests/bson-corpus/decimal128-1-valid-043.phpt +++ b/tests/bson-corpus/decimal128-1-valid-043.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000007C00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "NaN"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "nAn"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000007c00 -180000001364000000000000000000000000000000007c00 -{"d":{"$numberDecimal":"NaN"}} {"d":{"$numberDecimal":"NaN"}} 180000001364000000000000000000000000000000007c00 180000001364000000000000000000000000000000007c00 -180000001364000000000000000000000000000000007c00 -180000001364000000000000000000000000000000007c00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-1-valid-044.phpt b/tests/bson-corpus/decimal128-1-valid-044.phpt index e99f8b4b8..9a3ef4077 100644 --- a/tests/bson-corpus/decimal128-1-valid-044.phpt +++ b/tests/bson-corpus/decimal128-1-valid-044.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000007800'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "Infinity"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "+infinity"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000007800 -180000001364000000000000000000000000000000007800 -{"d":{"$numberDecimal":"Infinity"}} {"d":{"$numberDecimal":"Infinity"}} 180000001364000000000000000000000000000000007800 180000001364000000000000000000000000000000007800 -180000001364000000000000000000000000000000007800 -180000001364000000000000000000000000000000007800 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-1-valid-045.phpt b/tests/bson-corpus/decimal128-1-valid-045.phpt index 7961c5e0b..ecec42024 100644 --- a/tests/bson-corpus/decimal128-1-valid-045.phpt +++ b/tests/bson-corpus/decimal128-1-valid-045.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000007800'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "Infinity"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "infinity"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000007800 -180000001364000000000000000000000000000000007800 -{"d":{"$numberDecimal":"Infinity"}} {"d":{"$numberDecimal":"Infinity"}} 180000001364000000000000000000000000000000007800 180000001364000000000000000000000000000000007800 -180000001364000000000000000000000000000000007800 -180000001364000000000000000000000000000000007800 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-1-valid-046.phpt b/tests/bson-corpus/decimal128-1-valid-046.phpt index d1fd18559..d322a13ee 100644 --- a/tests/bson-corpus/decimal128-1-valid-046.phpt +++ b/tests/bson-corpus/decimal128-1-valid-046.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000007800'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "Infinity"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "infiniTY"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000007800 -180000001364000000000000000000000000000000007800 -{"d":{"$numberDecimal":"Infinity"}} {"d":{"$numberDecimal":"Infinity"}} 180000001364000000000000000000000000000000007800 180000001364000000000000000000000000000000007800 -180000001364000000000000000000000000000000007800 -180000001364000000000000000000000000000000007800 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-1-valid-047.phpt b/tests/bson-corpus/decimal128-1-valid-047.phpt index 8147b9a4a..a77439610 100644 --- a/tests/bson-corpus/decimal128-1-valid-047.phpt +++ b/tests/bson-corpus/decimal128-1-valid-047.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000007800'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "Infinity"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "inf"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000007800 -180000001364000000000000000000000000000000007800 -{"d":{"$numberDecimal":"Infinity"}} {"d":{"$numberDecimal":"Infinity"}} 180000001364000000000000000000000000000000007800 180000001364000000000000000000000000000000007800 -180000001364000000000000000000000000000000007800 -180000001364000000000000000000000000000000007800 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-1-valid-048.phpt b/tests/bson-corpus/decimal128-1-valid-048.phpt index 3a9adfc05..78adfa55a 100644 --- a/tests/bson-corpus/decimal128-1-valid-048.phpt +++ b/tests/bson-corpus/decimal128-1-valid-048.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000007800'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "Infinity"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "inF"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000007800 -180000001364000000000000000000000000000000007800 -{"d":{"$numberDecimal":"Infinity"}} {"d":{"$numberDecimal":"Infinity"}} 180000001364000000000000000000000000000000007800 180000001364000000000000000000000000000000007800 -180000001364000000000000000000000000000000007800 -180000001364000000000000000000000000000000007800 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-1-valid-049.phpt b/tests/bson-corpus/decimal128-1-valid-049.phpt index 91480e5b3..b2e352fb6 100644 --- a/tests/bson-corpus/decimal128-1-valid-049.phpt +++ b/tests/bson-corpus/decimal128-1-valid-049.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400000000000000000000000000000000F800'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-Infinity"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "-infinity"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400000000000000000000000000000000f800 -18000000136400000000000000000000000000000000f800 -{"d":{"$numberDecimal":"-Infinity"}} {"d":{"$numberDecimal":"-Infinity"}} 18000000136400000000000000000000000000000000f800 18000000136400000000000000000000000000000000f800 -18000000136400000000000000000000000000000000f800 -18000000136400000000000000000000000000000000f800 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-1-valid-050.phpt b/tests/bson-corpus/decimal128-1-valid-050.phpt index 3c51705a3..d3deefa17 100644 --- a/tests/bson-corpus/decimal128-1-valid-050.phpt +++ b/tests/bson-corpus/decimal128-1-valid-050.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400000000000000000000000000000000F800'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-Infinity"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "-infiniTy"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400000000000000000000000000000000f800 -18000000136400000000000000000000000000000000f800 -{"d":{"$numberDecimal":"-Infinity"}} {"d":{"$numberDecimal":"-Infinity"}} 18000000136400000000000000000000000000000000f800 18000000136400000000000000000000000000000000f800 -18000000136400000000000000000000000000000000f800 -18000000136400000000000000000000000000000000f800 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-1-valid-051.phpt b/tests/bson-corpus/decimal128-1-valid-051.phpt index 70960bb85..34c3fb09f 100644 --- a/tests/bson-corpus/decimal128-1-valid-051.phpt +++ b/tests/bson-corpus/decimal128-1-valid-051.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400000000000000000000000000000000F800'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-Infinity"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "-Infinity"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400000000000000000000000000000000f800 -18000000136400000000000000000000000000000000f800 -{"d":{"$numberDecimal":"-Infinity"}} {"d":{"$numberDecimal":"-Infinity"}} 18000000136400000000000000000000000000000000f800 18000000136400000000000000000000000000000000f800 -18000000136400000000000000000000000000000000f800 -18000000136400000000000000000000000000000000f800 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-1-valid-052.phpt b/tests/bson-corpus/decimal128-1-valid-052.phpt index 6e7244274..66bc3895f 100644 --- a/tests/bson-corpus/decimal128-1-valid-052.phpt +++ b/tests/bson-corpus/decimal128-1-valid-052.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400000000000000000000000000000000F800'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-Infinity"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "-inf"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400000000000000000000000000000000f800 -18000000136400000000000000000000000000000000f800 -{"d":{"$numberDecimal":"-Infinity"}} {"d":{"$numberDecimal":"-Infinity"}} 18000000136400000000000000000000000000000000f800 18000000136400000000000000000000000000000000f800 -18000000136400000000000000000000000000000000f800 -18000000136400000000000000000000000000000000f800 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-1-valid-053.phpt b/tests/bson-corpus/decimal128-1-valid-053.phpt index 2f1e65fb6..beb5ed61a 100644 --- a/tests/bson-corpus/decimal128-1-valid-053.phpt +++ b/tests/bson-corpus/decimal128-1-valid-053.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400000000000000000000000000000000F800'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-Infinity"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "-inF"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400000000000000000000000000000000f800 -18000000136400000000000000000000000000000000f800 -{"d":{"$numberDecimal":"-Infinity"}} {"d":{"$numberDecimal":"-Infinity"}} 18000000136400000000000000000000000000000000f800 18000000136400000000000000000000000000000000f800 -18000000136400000000000000000000000000000000f800 -18000000136400000000000000000000000000000000f800 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-1-valid-054.phpt b/tests/bson-corpus/decimal128-1-valid-054.phpt index 48b9bed46..301f70b33 100644 --- a/tests/bson-corpus/decimal128-1-valid-054.phpt +++ b/tests/bson-corpus/decimal128-1-valid-054.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000100000000000000000000000000000000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1E-6176"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "10E-6177"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000100000000000000000000000000000000 -180000001364000100000000000000000000000000000000 -{"d":{"$numberDecimal":"1E-6176"}} {"d":{"$numberDecimal":"1E-6176"}} 180000001364000100000000000000000000000000000000 180000001364000100000000000000000000000000000000 -180000001364000100000000000000000000000000000000 -180000001364000100000000000000000000000000000000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-1-valid-055.phpt b/tests/bson-corpus/decimal128-1-valid-055.phpt index ca09de32a..92c9668b7 100644 --- a/tests/bson-corpus/decimal128-1-valid-055.phpt +++ b/tests/bson-corpus/decimal128-1-valid-055.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000a00000000000000000000000000fe5f00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.0E+6112"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1E6112"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000a00000000000000000000000000fe5f00 -180000001364000a00000000000000000000000000fe5f00 -{"d":{"$numberDecimal":"1.0E+6112"}} {"d":{"$numberDecimal":"1.0E+6112"}} 180000001364000a00000000000000000000000000fe5f00 180000001364000a00000000000000000000000000fe5f00 -180000001364000a00000000000000000000000000fe5f00 -180000001364000a00000000000000000000000000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-1-valid-056.phpt b/tests/bson-corpus/decimal128-1-valid-056.phpt index 5fa7a259c..3ab503f56 100644 --- a/tests/bson-corpus/decimal128-1-valid-056.phpt +++ b/tests/bson-corpus/decimal128-1-valid-056.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400000000000a5bc138938d44c64d31cc3700'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.000000000000000000000000000000000E+999"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400000000000a5bc138938d44c64d31cc3700 -18000000136400000000000a5bc138938d44c64d31cc3700 -{"d":{"$numberDecimal":"1.000000000000000000000000000000000E+999"}} {"d":{"$numberDecimal":"1.000000000000000000000000000000000E+999"}} 18000000136400000000000a5bc138938d44c64d31cc3700 18000000136400000000000a5bc138938d44c64d31cc3700 -18000000136400000000000a5bc138938d44c64d31cc3700 -18000000136400000000000a5bc138938d44c64d31cc3700 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-1-valid-057.phpt b/tests/bson-corpus/decimal128-1-valid-057.phpt index 0a59ab729..8247a3f9d 100644 --- a/tests/bson-corpus/decimal128-1-valid-057.phpt +++ b/tests/bson-corpus/decimal128-1-valid-057.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0E+6111"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0E+2147483647"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000fe5f00 -180000001364000000000000000000000000000000fe5f00 -{"d":{"$numberDecimal":"0E+6111"}} {"d":{"$numberDecimal":"0E+6111"}} 180000001364000000000000000000000000000000fe5f00 180000001364000000000000000000000000000000fe5f00 -180000001364000000000000000000000000000000fe5f00 -180000001364000000000000000000000000000000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-1-valid-058.phpt b/tests/bson-corpus/decimal128-1-valid-058.phpt index 2ca34e65d..1642b24ed 100644 --- a/tests/bson-corpus/decimal128-1-valid-058.phpt +++ b/tests/bson-corpus/decimal128-1-valid-058.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000000000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0E-6176"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0E-2147483647"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000000000 -180000001364000000000000000000000000000000000000 -{"d":{"$numberDecimal":"0E-6176"}} {"d":{"$numberDecimal":"0E-6176"}} 180000001364000000000000000000000000000000000000 180000001364000000000000000000000000000000000000 -180000001364000000000000000000000000000000000000 -180000001364000000000000000000000000000000000000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-1-valid-059.phpt b/tests/bson-corpus/decimal128-1-valid-059.phpt index 778a99c71..50397894f 100644 --- a/tests/bson-corpus/decimal128-1-valid-059.phpt +++ b/tests/bson-corpus/decimal128-1-valid-059.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000FEDF00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-0E+6111"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "-0E+2147483647"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000fedf00 -180000001364000000000000000000000000000000fedf00 -{"d":{"$numberDecimal":"-0E+6111"}} {"d":{"$numberDecimal":"-0E+6111"}} 180000001364000000000000000000000000000000fedf00 180000001364000000000000000000000000000000fedf00 -180000001364000000000000000000000000000000fedf00 -180000001364000000000000000000000000000000fedf00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-1-valid-060.phpt b/tests/bson-corpus/decimal128-1-valid-060.phpt index 462fc0a81..ea34d39a7 100644 --- a/tests/bson-corpus/decimal128-1-valid-060.phpt +++ b/tests/bson-corpus/decimal128-1-valid-060.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000008000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-0E-6176"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "-0E-2147483647"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000008000 -180000001364000000000000000000000000000000008000 -{"d":{"$numberDecimal":"-0E-6176"}} {"d":{"$numberDecimal":"-0E-6176"}} 180000001364000000000000000000000000000000008000 180000001364000000000000000000000000000000008000 -180000001364000000000000000000000000000000008000 -180000001364000000000000000000000000000000008000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-001.phpt b/tests/bson-corpus/decimal128-2-valid-001.phpt index 0ff5565c4..7e63948aa 100644 --- a/tests/bson-corpus/decimal128-2-valid-001.phpt +++ b/tests/bson-corpus/decimal128-2-valid-001.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400F2AF967ED05C82DE3297FF6FDE3C40B000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-1234567890123456789012345678901234"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400f2af967ed05c82de3297ff6fde3c40b000 -18000000136400f2af967ed05c82de3297ff6fde3c40b000 -{"d":{"$numberDecimal":"-1234567890123456789012345678901234"}} {"d":{"$numberDecimal":"-1234567890123456789012345678901234"}} 18000000136400f2af967ed05c82de3297ff6fde3c40b000 -18000000136400f2af967ed05c82de3297ff6fde3c40b000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-002.phpt b/tests/bson-corpus/decimal128-2-valid-002.phpt index 9549294c6..a3f309efb 100644 --- a/tests/bson-corpus/decimal128-2-valid-002.phpt +++ b/tests/bson-corpus/decimal128-2-valid-002.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400010000800000000000000000000040B000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-2147483649"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400010000800000000000000000000040b000 -18000000136400010000800000000000000000000040b000 -{"d":{"$numberDecimal":"-2147483649"}} {"d":{"$numberDecimal":"-2147483649"}} 18000000136400010000800000000000000000000040b000 -18000000136400010000800000000000000000000040b000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-003.phpt b/tests/bson-corpus/decimal128-2-valid-003.phpt index eaee7f4a0..b7e03bbbb 100644 --- a/tests/bson-corpus/decimal128-2-valid-003.phpt +++ b/tests/bson-corpus/decimal128-2-valid-003.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400000000800000000000000000000040B000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-2147483648"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400000000800000000000000000000040b000 -18000000136400000000800000000000000000000040b000 -{"d":{"$numberDecimal":"-2147483648"}} {"d":{"$numberDecimal":"-2147483648"}} 18000000136400000000800000000000000000000040b000 -18000000136400000000800000000000000000000040b000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-004.phpt b/tests/bson-corpus/decimal128-2-valid-004.phpt index 82f5d1ce8..9b259898e 100644 --- a/tests/bson-corpus/decimal128-2-valid-004.phpt +++ b/tests/bson-corpus/decimal128-2-valid-004.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400FFFFFF7F0000000000000000000040B000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-2147483647"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400ffffff7f0000000000000000000040b000 -18000000136400ffffff7f0000000000000000000040b000 -{"d":{"$numberDecimal":"-2147483647"}} {"d":{"$numberDecimal":"-2147483647"}} 18000000136400ffffff7f0000000000000000000040b000 -18000000136400ffffff7f0000000000000000000040b000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-005.phpt b/tests/bson-corpus/decimal128-2-valid-005.phpt index 4df3adc77..b8ec00343 100644 --- a/tests/bson-corpus/decimal128-2-valid-005.phpt +++ b/tests/bson-corpus/decimal128-2-valid-005.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400FEFFFF7F0000000000000000000040B000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-2147483646"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400feffff7f0000000000000000000040b000 -18000000136400feffff7f0000000000000000000040b000 -{"d":{"$numberDecimal":"-2147483646"}} {"d":{"$numberDecimal":"-2147483646"}} 18000000136400feffff7f0000000000000000000040b000 -18000000136400feffff7f0000000000000000000040b000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-006.phpt b/tests/bson-corpus/decimal128-2-valid-006.phpt index cca1cc3ab..af8f13b7d 100644 --- a/tests/bson-corpus/decimal128-2-valid-006.phpt +++ b/tests/bson-corpus/decimal128-2-valid-006.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400393000000000000000000000000040B000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-12345"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400393000000000000000000000000040b000 -18000000136400393000000000000000000000000040b000 -{"d":{"$numberDecimal":"-12345"}} {"d":{"$numberDecimal":"-12345"}} 18000000136400393000000000000000000000000040b000 -18000000136400393000000000000000000000000040b000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-007.phpt b/tests/bson-corpus/decimal128-2-valid-007.phpt index c7b044c8e..693ece028 100644 --- a/tests/bson-corpus/decimal128-2-valid-007.phpt +++ b/tests/bson-corpus/decimal128-2-valid-007.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400D20400000000000000000000000040B000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-1234"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400d20400000000000000000000000040b000 -18000000136400d20400000000000000000000000040b000 -{"d":{"$numberDecimal":"-1234"}} {"d":{"$numberDecimal":"-1234"}} 18000000136400d20400000000000000000000000040b000 -18000000136400d20400000000000000000000000040b000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-008.phpt b/tests/bson-corpus/decimal128-2-valid-008.phpt index 50122efaf..a0b08b59b 100644 --- a/tests/bson-corpus/decimal128-2-valid-008.phpt +++ b/tests/bson-corpus/decimal128-2-valid-008.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400EE0200000000000000000000000040B000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-750"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400ee0200000000000000000000000040b000 -18000000136400ee0200000000000000000000000040b000 -{"d":{"$numberDecimal":"-750"}} {"d":{"$numberDecimal":"-750"}} 18000000136400ee0200000000000000000000000040b000 -18000000136400ee0200000000000000000000000040b000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-009.phpt b/tests/bson-corpus/decimal128-2-valid-009.phpt index e27eaddf4..678702cb2 100644 --- a/tests/bson-corpus/decimal128-2-valid-009.phpt +++ b/tests/bson-corpus/decimal128-2-valid-009.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1800000013640039300000000000000000000000003CB000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-123.45"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1800000013640039300000000000000000000000003cb000 -1800000013640039300000000000000000000000003cb000 -{"d":{"$numberDecimal":"-123.45"}} {"d":{"$numberDecimal":"-123.45"}} 1800000013640039300000000000000000000000003cb000 -1800000013640039300000000000000000000000003cb000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-010.phpt b/tests/bson-corpus/decimal128-2-valid-010.phpt index 6275087cc..e434c384d 100644 --- a/tests/bson-corpus/decimal128-2-valid-010.phpt +++ b/tests/bson-corpus/decimal128-2-valid-010.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364007B0000000000000000000000000040B000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-123"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364007b0000000000000000000000000040b000 -180000001364007b0000000000000000000000000040b000 -{"d":{"$numberDecimal":"-123"}} {"d":{"$numberDecimal":"-123"}} 180000001364007b0000000000000000000000000040b000 -180000001364007b0000000000000000000000000040b000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-011.phpt b/tests/bson-corpus/decimal128-2-valid-011.phpt index 12215dc22..2036d4464 100644 --- a/tests/bson-corpus/decimal128-2-valid-011.phpt +++ b/tests/bson-corpus/decimal128-2-valid-011.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400EE020000000000000000000000003EB000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-75.0"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400ee020000000000000000000000003eb000 -18000000136400ee020000000000000000000000003eb000 -{"d":{"$numberDecimal":"-75.0"}} {"d":{"$numberDecimal":"-75.0"}} 18000000136400ee020000000000000000000000003eb000 -18000000136400ee020000000000000000000000003eb000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-012.phpt b/tests/bson-corpus/decimal128-2-valid-012.phpt index f3273bb3d..5f4ffe343 100644 --- a/tests/bson-corpus/decimal128-2-valid-012.phpt +++ b/tests/bson-corpus/decimal128-2-valid-012.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000C0000000000000000000000000040B000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-12"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000c0000000000000000000000000040b000 -180000001364000c0000000000000000000000000040b000 -{"d":{"$numberDecimal":"-12"}} {"d":{"$numberDecimal":"-12"}} 180000001364000c0000000000000000000000000040b000 -180000001364000c0000000000000000000000000040b000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-013.phpt b/tests/bson-corpus/decimal128-2-valid-013.phpt index e3a4bf2e9..222601234 100644 --- a/tests/bson-corpus/decimal128-2-valid-013.phpt +++ b/tests/bson-corpus/decimal128-2-valid-013.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400FFFFFFFF638E8D37C087ADBE09EDFFDF00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-9.999999999999999999999999999999999E+6144"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400ffffffff638e8d37c087adbe09edffdf00 -18000000136400ffffffff638e8d37c087adbe09edffdf00 -{"d":{"$numberDecimal":"-9.999999999999999999999999999999999E+6144"}} {"d":{"$numberDecimal":"-9.999999999999999999999999999999999E+6144"}} 18000000136400ffffffff638e8d37c087adbe09edffdf00 -18000000136400ffffffff638e8d37c087adbe09edffdf00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-014.phpt b/tests/bson-corpus/decimal128-2-valid-014.phpt index fb4045d16..49538b0c6 100644 --- a/tests/bson-corpus/decimal128-2-valid-014.phpt +++ b/tests/bson-corpus/decimal128-2-valid-014.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400EE020000000000000000000000003CB000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-7.50"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400ee020000000000000000000000003cb000 -18000000136400ee020000000000000000000000003cb000 -{"d":{"$numberDecimal":"-7.50"}} {"d":{"$numberDecimal":"-7.50"}} 18000000136400ee020000000000000000000000003cb000 -18000000136400ee020000000000000000000000003cb000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-015.phpt b/tests/bson-corpus/decimal128-2-valid-015.phpt index e7180ab5f..0ba0e90ca 100644 --- a/tests/bson-corpus/decimal128-2-valid-015.phpt +++ b/tests/bson-corpus/decimal128-2-valid-015.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400EE0200000000000000000000000042B000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-7.50E+3"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400ee0200000000000000000000000042b000 -18000000136400ee0200000000000000000000000042b000 -{"d":{"$numberDecimal":"-7.50E+3"}} {"d":{"$numberDecimal":"-7.50E+3"}} 18000000136400ee0200000000000000000000000042b000 -18000000136400ee0200000000000000000000000042b000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-016.phpt b/tests/bson-corpus/decimal128-2-valid-016.phpt index aad912a14..6acf4f214 100644 --- a/tests/bson-corpus/decimal128-2-valid-016.phpt +++ b/tests/bson-corpus/decimal128-2-valid-016.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400EE020000000000000000000000002EB000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-7.50E-7"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400ee020000000000000000000000002eb000 -18000000136400ee020000000000000000000000002eb000 -{"d":{"$numberDecimal":"-7.50E-7"}} {"d":{"$numberDecimal":"-7.50E-7"}} 18000000136400ee020000000000000000000000002eb000 -18000000136400ee020000000000000000000000002eb000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-017.phpt b/tests/bson-corpus/decimal128-2-valid-017.phpt index 305665ae0..7ca246391 100644 --- a/tests/bson-corpus/decimal128-2-valid-017.phpt +++ b/tests/bson-corpus/decimal128-2-valid-017.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400F2AF967ED05C82DE3297FF6FDE3CFEDF00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-1.234567890123456789012345678901234E+6144"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400f2af967ed05c82de3297ff6fde3cfedf00 -18000000136400f2af967ed05c82de3297ff6fde3cfedf00 -{"d":{"$numberDecimal":"-1.234567890123456789012345678901234E+6144"}} {"d":{"$numberDecimal":"-1.234567890123456789012345678901234E+6144"}} 18000000136400f2af967ed05c82de3297ff6fde3cfedf00 -18000000136400f2af967ed05c82de3297ff6fde3cfedf00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-018.phpt b/tests/bson-corpus/decimal128-2-valid-018.phpt index 010bdfaeb..8a7e16f87 100644 --- a/tests/bson-corpus/decimal128-2-valid-018.phpt +++ b/tests/bson-corpus/decimal128-2-valid-018.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400000000807F1BCF85B27059C8A43CFEDF00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-1.230000000000000000000000000000000E+6144"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400000000807f1bcf85b27059c8a43cfedf00 -18000000136400000000807f1bcf85b27059c8a43cfedf00 -{"d":{"$numberDecimal":"-1.230000000000000000000000000000000E+6144"}} {"d":{"$numberDecimal":"-1.230000000000000000000000000000000E+6144"}} 18000000136400000000807f1bcf85b27059c8a43cfedf00 -18000000136400000000807f1bcf85b27059c8a43cfedf00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-019.phpt b/tests/bson-corpus/decimal128-2-valid-019.phpt index fc00cba22..cb4f40f0b 100644 --- a/tests/bson-corpus/decimal128-2-valid-019.phpt +++ b/tests/bson-corpus/decimal128-2-valid-019.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364007B000000000000000000000000003CB000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-1.23"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364007b000000000000000000000000003cb000 -180000001364007b000000000000000000000000003cb000 -{"d":{"$numberDecimal":"-1.23"}} {"d":{"$numberDecimal":"-1.23"}} 180000001364007b000000000000000000000000003cb000 -180000001364007b000000000000000000000000003cb000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-020.phpt b/tests/bson-corpus/decimal128-2-valid-020.phpt index 3af083758..51c2dd8d7 100644 --- a/tests/bson-corpus/decimal128-2-valid-020.phpt +++ b/tests/bson-corpus/decimal128-2-valid-020.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400010000000A5BC138938D44C64D31008000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-1.000000000000000000000000000000001E-6143"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400010000000a5bc138938d44c64d31008000 -18000000136400010000000a5bc138938d44c64d31008000 -{"d":{"$numberDecimal":"-1.000000000000000000000000000000001E-6143"}} {"d":{"$numberDecimal":"-1.000000000000000000000000000000001E-6143"}} 18000000136400010000000a5bc138938d44c64d31008000 -18000000136400010000000a5bc138938d44c64d31008000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-021.phpt b/tests/bson-corpus/decimal128-2-valid-021.phpt index 6e6669a20..fe565f3e4 100644 --- a/tests/bson-corpus/decimal128-2-valid-021.phpt +++ b/tests/bson-corpus/decimal128-2-valid-021.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400000000000A5BC138938D44C64D31008000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-1.000000000000000000000000000000000E-6143"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400000000000a5bc138938d44c64d31008000 -18000000136400000000000a5bc138938d44c64d31008000 -{"d":{"$numberDecimal":"-1.000000000000000000000000000000000E-6143"}} {"d":{"$numberDecimal":"-1.000000000000000000000000000000000E-6143"}} 18000000136400000000000a5bc138938d44c64d31008000 -18000000136400000000000a5bc138938d44c64d31008000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-022.phpt b/tests/bson-corpus/decimal128-2-valid-022.phpt index f61a0a8b7..272b7cb89 100644 --- a/tests/bson-corpus/decimal128-2-valid-022.phpt +++ b/tests/bson-corpus/decimal128-2-valid-022.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400000000000A5BC138938D44C64D31FEDF00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-1.000000000000000000000000000000000E+6144"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400000000000a5bc138938d44c64d31fedf00 -18000000136400000000000a5bc138938d44c64d31fedf00 -{"d":{"$numberDecimal":"-1.000000000000000000000000000000000E+6144"}} {"d":{"$numberDecimal":"-1.000000000000000000000000000000000E+6144"}} 18000000136400000000000a5bc138938d44c64d31fedf00 -18000000136400000000000a5bc138938d44c64d31fedf00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-023.phpt b/tests/bson-corpus/decimal128-2-valid-023.phpt index 5af553953..63a117901 100644 --- a/tests/bson-corpus/decimal128-2-valid-023.phpt +++ b/tests/bson-corpus/decimal128-2-valid-023.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400010000000000000000000000000040B000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-1"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400010000000000000000000000000040b000 -18000000136400010000000000000000000000000040b000 -{"d":{"$numberDecimal":"-1"}} {"d":{"$numberDecimal":"-1"}} 18000000136400010000000000000000000000000040b000 -18000000136400010000000000000000000000000040b000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-024.phpt b/tests/bson-corpus/decimal128-2-valid-024.phpt index 846988849..774f722fc 100644 --- a/tests/bson-corpus/decimal128-2-valid-024.phpt +++ b/tests/bson-corpus/decimal128-2-valid-024.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000100000000000000000000000000428000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-1E-6143"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000100000000000000000000000000428000 -180000001364000100000000000000000000000000428000 -{"d":{"$numberDecimal":"-1E-6143"}} {"d":{"$numberDecimal":"-1E-6143"}} 180000001364000100000000000000000000000000428000 -180000001364000100000000000000000000000000428000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-025.phpt b/tests/bson-corpus/decimal128-2-valid-025.phpt index 2963dd08b..527b4d26f 100644 --- a/tests/bson-corpus/decimal128-2-valid-025.phpt +++ b/tests/bson-corpus/decimal128-2-valid-025.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400EE020000000000000000000000003AB000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-0.750"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400ee020000000000000000000000003ab000 -18000000136400ee020000000000000000000000003ab000 -{"d":{"$numberDecimal":"-0.750"}} {"d":{"$numberDecimal":"-0.750"}} 18000000136400ee020000000000000000000000003ab000 -18000000136400ee020000000000000000000000003ab000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-026.phpt b/tests/bson-corpus/decimal128-2-valid-026.phpt index 131c91e52..d45305662 100644 --- a/tests/bson-corpus/decimal128-2-valid-026.phpt +++ b/tests/bson-corpus/decimal128-2-valid-026.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400EE0200000000000000000000000038B000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-0.0750"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400ee0200000000000000000000000038b000 -18000000136400ee0200000000000000000000000038b000 -{"d":{"$numberDecimal":"-0.0750"}} {"d":{"$numberDecimal":"-0.0750"}} 18000000136400ee0200000000000000000000000038b000 -18000000136400ee0200000000000000000000000038b000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-027.phpt b/tests/bson-corpus/decimal128-2-valid-027.phpt index 51a978351..9c3031d99 100644 --- a/tests/bson-corpus/decimal128-2-valid-027.phpt +++ b/tests/bson-corpus/decimal128-2-valid-027.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400EE0200000000000000000000000034B000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-0.000750"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400ee0200000000000000000000000034b000 -18000000136400ee0200000000000000000000000034b000 -{"d":{"$numberDecimal":"-0.000750"}} {"d":{"$numberDecimal":"-0.000750"}} 18000000136400ee0200000000000000000000000034b000 -18000000136400ee0200000000000000000000000034b000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-028.phpt b/tests/bson-corpus/decimal128-2-valid-028.phpt index d85bb4b6b..45e848cf6 100644 --- a/tests/bson-corpus/decimal128-2-valid-028.phpt +++ b/tests/bson-corpus/decimal128-2-valid-028.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400EE0200000000000000000000000030B000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-0.00000750"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400ee0200000000000000000000000030b000 -18000000136400ee0200000000000000000000000030b000 -{"d":{"$numberDecimal":"-0.00000750"}} {"d":{"$numberDecimal":"-0.00000750"}} 18000000136400ee0200000000000000000000000030b000 -18000000136400ee0200000000000000000000000030b000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-029.phpt b/tests/bson-corpus/decimal128-2-valid-029.phpt index a5db01831..629c04185 100644 --- a/tests/bson-corpus/decimal128-2-valid-029.phpt +++ b/tests/bson-corpus/decimal128-2-valid-029.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000000000000000000000000000000000000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0E-6176"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000000000000000000000000000000000000 -180000001364000000000000000000000000000000000000 -{"d":{"$numberDecimal":"0E-6176"}} {"d":{"$numberDecimal":"0E-6176"}} 180000001364000000000000000000000000000000000000 -180000001364000000000000000000000000000000000000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-030.phpt b/tests/bson-corpus/decimal128-2-valid-030.phpt index 75961d5b7..72f473d39 100644 --- a/tests/bson-corpus/decimal128-2-valid-030.phpt +++ b/tests/bson-corpus/decimal128-2-valid-030.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000000000000000000000000000000008000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-0E-6176"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000000000000000000000000000000008000 -180000001364000000000000000000000000000000008000 -{"d":{"$numberDecimal":"-0E-6176"}} {"d":{"$numberDecimal":"-0E-6176"}} 180000001364000000000000000000000000000000008000 -180000001364000000000000000000000000000000008000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-031.phpt b/tests/bson-corpus/decimal128-2-valid-031.phpt index 7590bb132..f1996e597 100644 --- a/tests/bson-corpus/decimal128-2-valid-031.phpt +++ b/tests/bson-corpus/decimal128-2-valid-031.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1800000013640000000000000000000000000000003C3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.00"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1800000013640000000000000000000000000000003c3000 -1800000013640000000000000000000000000000003c3000 -{"d":{"$numberDecimal":"0.00"}} {"d":{"$numberDecimal":"0.00"}} 1800000013640000000000000000000000000000003c3000 -1800000013640000000000000000000000000000003c3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-032.phpt b/tests/bson-corpus/decimal128-2-valid-032.phpt index 7a2cc63c4..c87f2f6ff 100644 --- a/tests/bson-corpus/decimal128-2-valid-032.phpt +++ b/tests/bson-corpus/decimal128-2-valid-032.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1800000013640000000000000000000000000000003CB000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-0.00"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1800000013640000000000000000000000000000003cb000 -1800000013640000000000000000000000000000003cb000 -{"d":{"$numberDecimal":"-0.00"}} {"d":{"$numberDecimal":"-0.00"}} 1800000013640000000000000000000000000000003cb000 -1800000013640000000000000000000000000000003cb000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-033.phpt b/tests/bson-corpus/decimal128-2-valid-033.phpt index bf8b69743..d72dd2137 100644 --- a/tests/bson-corpus/decimal128-2-valid-033.phpt +++ b/tests/bson-corpus/decimal128-2-valid-033.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000000000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000000000000000000000000000000403000 -180000001364000000000000000000000000000000403000 -{"d":{"$numberDecimal":"0"}} {"d":{"$numberDecimal":"0"}} 180000001364000000000000000000000000000000403000 -180000001364000000000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-034.phpt b/tests/bson-corpus/decimal128-2-valid-034.phpt index a615ba357..584682c7b 100644 --- a/tests/bson-corpus/decimal128-2-valid-034.phpt +++ b/tests/bson-corpus/decimal128-2-valid-034.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400000000000000000000000000000040B000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-0"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400000000000000000000000000000040b000 -18000000136400000000000000000000000000000040b000 -{"d":{"$numberDecimal":"-0"}} {"d":{"$numberDecimal":"-0"}} 18000000136400000000000000000000000000000040b000 -18000000136400000000000000000000000000000040b000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-035.phpt b/tests/bson-corpus/decimal128-2-valid-035.phpt index 045119bc6..d6048028f 100644 --- a/tests/bson-corpus/decimal128-2-valid-035.phpt +++ b/tests/bson-corpus/decimal128-2-valid-035.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000000000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000000000000000000000000000000403000 -180000001364000000000000000000000000000000403000 -{"d":{"$numberDecimal":"0"}} {"d":{"$numberDecimal":"0"}} 180000001364000000000000000000000000000000403000 -180000001364000000000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-036.phpt b/tests/bson-corpus/decimal128-2-valid-036.phpt index f330f82c7..562655d00 100644 --- a/tests/bson-corpus/decimal128-2-valid-036.phpt +++ b/tests/bson-corpus/decimal128-2-valid-036.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1800000013640000000000000000000000000000003C3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.00"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1800000013640000000000000000000000000000003c3000 -1800000013640000000000000000000000000000003c3000 -{"d":{"$numberDecimal":"0.00"}} {"d":{"$numberDecimal":"0.00"}} 1800000013640000000000000000000000000000003c3000 -1800000013640000000000000000000000000000003c3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-037.phpt b/tests/bson-corpus/decimal128-2-valid-037.phpt index 405e8d2f0..86da17d3a 100644 --- a/tests/bson-corpus/decimal128-2-valid-037.phpt +++ b/tests/bson-corpus/decimal128-2-valid-037.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1800000013640000000000000000000000000000003CB000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-0.00"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1800000013640000000000000000000000000000003cb000 -1800000013640000000000000000000000000000003cb000 -{"d":{"$numberDecimal":"-0.00"}} {"d":{"$numberDecimal":"-0.00"}} 1800000013640000000000000000000000000000003cb000 -1800000013640000000000000000000000000000003cb000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-038.phpt b/tests/bson-corpus/decimal128-2-valid-038.phpt index b37a1860d..7178b8740 100644 --- a/tests/bson-corpus/decimal128-2-valid-038.phpt +++ b/tests/bson-corpus/decimal128-2-valid-038.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000000000000000000000000000000463000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0E+3"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000000000000000000000000000000463000 -180000001364000000000000000000000000000000463000 -{"d":{"$numberDecimal":"0E+3"}} {"d":{"$numberDecimal":"0E+3"}} 180000001364000000000000000000000000000000463000 -180000001364000000000000000000000000000000463000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-039.phpt b/tests/bson-corpus/decimal128-2-valid-039.phpt index d7e5be9d0..210b869fe 100644 --- a/tests/bson-corpus/decimal128-2-valid-039.phpt +++ b/tests/bson-corpus/decimal128-2-valid-039.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400000000000000000000000000000046B000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-0E+3"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400000000000000000000000000000046b000 -18000000136400000000000000000000000000000046b000 -{"d":{"$numberDecimal":"-0E+3"}} {"d":{"$numberDecimal":"-0E+3"}} 18000000136400000000000000000000000000000046b000 -18000000136400000000000000000000000000000046b000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-040.phpt b/tests/bson-corpus/decimal128-2-valid-040.phpt index 6c8f874eb..d7345e4b8 100644 --- a/tests/bson-corpus/decimal128-2-valid-040.phpt +++ b/tests/bson-corpus/decimal128-2-valid-040.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000000000000000000000000000000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0E+6111"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000000000000000000000000000000fe5f00 -180000001364000000000000000000000000000000fe5f00 -{"d":{"$numberDecimal":"0E+6111"}} {"d":{"$numberDecimal":"0E+6111"}} 180000001364000000000000000000000000000000fe5f00 -180000001364000000000000000000000000000000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-041.phpt b/tests/bson-corpus/decimal128-2-valid-041.phpt index 8f4fd4cf0..891712577 100644 --- a/tests/bson-corpus/decimal128-2-valid-041.phpt +++ b/tests/bson-corpus/decimal128-2-valid-041.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000000000000000000000000000000FEDF00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-0E+6111"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000000000000000000000000000000fedf00 -180000001364000000000000000000000000000000fedf00 -{"d":{"$numberDecimal":"-0E+6111"}} {"d":{"$numberDecimal":"-0E+6111"}} 180000001364000000000000000000000000000000fedf00 -180000001364000000000000000000000000000000fedf00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-042.phpt b/tests/bson-corpus/decimal128-2-valid-042.phpt index d23b8c3fc..baba248e1 100644 --- a/tests/bson-corpus/decimal128-2-valid-042.phpt +++ b/tests/bson-corpus/decimal128-2-valid-042.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000000000000000000000000000000000000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0E-6176"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000000000000000000000000000000000000 -180000001364000000000000000000000000000000000000 -{"d":{"$numberDecimal":"0E-6176"}} {"d":{"$numberDecimal":"0E-6176"}} 180000001364000000000000000000000000000000000000 -180000001364000000000000000000000000000000000000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-043.phpt b/tests/bson-corpus/decimal128-2-valid-043.phpt index 78d615ee8..5c2458b7c 100644 --- a/tests/bson-corpus/decimal128-2-valid-043.phpt +++ b/tests/bson-corpus/decimal128-2-valid-043.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000000000000000000000000000000008000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-0E-6176"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000000000000000000000000000000008000 -180000001364000000000000000000000000000000008000 -{"d":{"$numberDecimal":"-0E-6176"}} {"d":{"$numberDecimal":"-0E-6176"}} 180000001364000000000000000000000000000000008000 -180000001364000000000000000000000000000000008000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-044.phpt b/tests/bson-corpus/decimal128-2-valid-044.phpt index a0cf6256e..076571e0e 100644 --- a/tests/bson-corpus/decimal128-2-valid-044.phpt +++ b/tests/bson-corpus/decimal128-2-valid-044.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000000000000000000000000000000007800'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "Infinity"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000000000000000000000000000000007800 -180000001364000000000000000000000000000000007800 -{"d":{"$numberDecimal":"Infinity"}} {"d":{"$numberDecimal":"Infinity"}} 180000001364000000000000000000000000000000007800 -180000001364000000000000000000000000000000007800 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-045.phpt b/tests/bson-corpus/decimal128-2-valid-045.phpt index c85d94ea8..5532fa518 100644 --- a/tests/bson-corpus/decimal128-2-valid-045.phpt +++ b/tests/bson-corpus/decimal128-2-valid-045.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400000000000000000000000000000000F800'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-Infinity"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400000000000000000000000000000000f800 -18000000136400000000000000000000000000000000f800 -{"d":{"$numberDecimal":"-Infinity"}} {"d":{"$numberDecimal":"-Infinity"}} 18000000136400000000000000000000000000000000f800 -18000000136400000000000000000000000000000000f800 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-046.phpt b/tests/bson-corpus/decimal128-2-valid-046.phpt index 9e4dbf3d2..c52fb03a1 100644 --- a/tests/bson-corpus/decimal128-2-valid-046.phpt +++ b/tests/bson-corpus/decimal128-2-valid-046.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000000000000000000000000000000007C00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "NaN"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000000000000000000000000000000007c00 -180000001364000000000000000000000000000000007c00 -{"d":{"$numberDecimal":"NaN"}} {"d":{"$numberDecimal":"NaN"}} 180000001364000000000000000000000000000000007c00 -180000001364000000000000000000000000000000007c00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-047.phpt b/tests/bson-corpus/decimal128-2-valid-047.phpt index b508bcb8a..c7d7edc7d 100644 --- a/tests/bson-corpus/decimal128-2-valid-047.phpt +++ b/tests/bson-corpus/decimal128-2-valid-047.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400000000000A5BC138938D44C64D31000000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.000000000000000000000000000000000E-6143"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400000000000a5bc138938d44c64d31000000 -18000000136400000000000a5bc138938d44c64d31000000 -{"d":{"$numberDecimal":"1.000000000000000000000000000000000E-6143"}} {"d":{"$numberDecimal":"1.000000000000000000000000000000000E-6143"}} 18000000136400000000000a5bc138938d44c64d31000000 -18000000136400000000000a5bc138938d44c64d31000000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-048.phpt b/tests/bson-corpus/decimal128-2-valid-048.phpt index 1ae09ea4d..7e164134a 100644 --- a/tests/bson-corpus/decimal128-2-valid-048.phpt +++ b/tests/bson-corpus/decimal128-2-valid-048.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400000000000A5BC138938D44C64D31FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.000000000000000000000000000000000E+6144"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400000000000a5bc138938d44c64d31fe5f00 -18000000136400000000000a5bc138938d44c64d31fe5f00 -{"d":{"$numberDecimal":"1.000000000000000000000000000000000E+6144"}} {"d":{"$numberDecimal":"1.000000000000000000000000000000000E+6144"}} 18000000136400000000000a5bc138938d44c64d31fe5f00 -18000000136400000000000a5bc138938d44c64d31fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-049.phpt b/tests/bson-corpus/decimal128-2-valid-049.phpt index 02aa206db..b4e68dfaf 100644 --- a/tests/bson-corpus/decimal128-2-valid-049.phpt +++ b/tests/bson-corpus/decimal128-2-valid-049.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000000000081EFAC855B416D2DEE04FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.00000000000000000000000000000000E+6143"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000000000081efac855b416d2dee04fe5f00 -180000001364000000000081efac855b416d2dee04fe5f00 -{"d":{"$numberDecimal":"1.00000000000000000000000000000000E+6143"}} {"d":{"$numberDecimal":"1.00000000000000000000000000000000E+6143"}} 180000001364000000000081efac855b416d2dee04fe5f00 -180000001364000000000081efac855b416d2dee04fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-050.phpt b/tests/bson-corpus/decimal128-2-valid-050.phpt index 7e29e38c8..686cbf54a 100644 --- a/tests/bson-corpus/decimal128-2-valid-050.phpt +++ b/tests/bson-corpus/decimal128-2-valid-050.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1800000013640000000080264B91C02220BE377E00FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.0000000000000000000000000000000E+6142"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1800000013640000000080264b91c02220be377e00fe5f00 -1800000013640000000080264b91c02220be377e00fe5f00 -{"d":{"$numberDecimal":"1.0000000000000000000000000000000E+6142"}} {"d":{"$numberDecimal":"1.0000000000000000000000000000000E+6142"}} 1800000013640000000080264b91c02220be377e00fe5f00 -1800000013640000000080264b91c02220be377e00fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-051.phpt b/tests/bson-corpus/decimal128-2-valid-051.phpt index e923e23ed..905875de6 100644 --- a/tests/bson-corpus/decimal128-2-valid-051.phpt +++ b/tests/bson-corpus/decimal128-2-valid-051.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1800000013640000000040EAED7446D09C2C9F0C00FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.000000000000000000000000000000E+6141"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1800000013640000000040eaed7446d09c2c9f0c00fe5f00 -1800000013640000000040eaed7446d09c2c9f0c00fe5f00 -{"d":{"$numberDecimal":"1.000000000000000000000000000000E+6141"}} {"d":{"$numberDecimal":"1.000000000000000000000000000000E+6141"}} 1800000013640000000040eaed7446d09c2c9f0c00fe5f00 -1800000013640000000040eaed7446d09c2c9f0c00fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-052.phpt b/tests/bson-corpus/decimal128-2-valid-052.phpt index 008d6f0bb..af42c5712 100644 --- a/tests/bson-corpus/decimal128-2-valid-052.phpt +++ b/tests/bson-corpus/decimal128-2-valid-052.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400000000A0CA17726DAE0F1E430100FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.00000000000000000000000000000E+6140"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400000000a0ca17726dae0f1e430100fe5f00 -18000000136400000000a0ca17726dae0f1e430100fe5f00 -{"d":{"$numberDecimal":"1.00000000000000000000000000000E+6140"}} {"d":{"$numberDecimal":"1.00000000000000000000000000000E+6140"}} 18000000136400000000a0ca17726dae0f1e430100fe5f00 -18000000136400000000a0ca17726dae0f1e430100fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-053.phpt b/tests/bson-corpus/decimal128-2-valid-053.phpt index 3b5616f6b..235cf57c7 100644 --- a/tests/bson-corpus/decimal128-2-valid-053.phpt +++ b/tests/bson-corpus/decimal128-2-valid-053.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400000000106102253E5ECE4F200000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.0000000000000000000000000000E+6139"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400000000106102253e5ece4f200000fe5f00 -18000000136400000000106102253e5ece4f200000fe5f00 -{"d":{"$numberDecimal":"1.0000000000000000000000000000E+6139"}} {"d":{"$numberDecimal":"1.0000000000000000000000000000E+6139"}} 18000000136400000000106102253e5ece4f200000fe5f00 -18000000136400000000106102253e5ece4f200000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-054.phpt b/tests/bson-corpus/decimal128-2-valid-054.phpt index 84678c1a5..b405054ed 100644 --- a/tests/bson-corpus/decimal128-2-valid-054.phpt +++ b/tests/bson-corpus/decimal128-2-valid-054.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400000000E83C80D09F3C2E3B030000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.000000000000000000000000000E+6138"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400000000e83c80d09f3c2e3b030000fe5f00 -18000000136400000000e83c80d09f3c2e3b030000fe5f00 -{"d":{"$numberDecimal":"1.000000000000000000000000000E+6138"}} {"d":{"$numberDecimal":"1.000000000000000000000000000E+6138"}} 18000000136400000000e83c80d09f3c2e3b030000fe5f00 -18000000136400000000e83c80d09f3c2e3b030000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-055.phpt b/tests/bson-corpus/decimal128-2-valid-055.phpt index 7035246d6..1c80ae653 100644 --- a/tests/bson-corpus/decimal128-2-valid-055.phpt +++ b/tests/bson-corpus/decimal128-2-valid-055.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400000000E4D20CC8DCD2B752000000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.00000000000000000000000000E+6137"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400000000e4d20cc8dcd2b752000000fe5f00 -18000000136400000000e4d20cc8dcd2b752000000fe5f00 -{"d":{"$numberDecimal":"1.00000000000000000000000000E+6137"}} {"d":{"$numberDecimal":"1.00000000000000000000000000E+6137"}} 18000000136400000000e4d20cc8dcd2b752000000fe5f00 -18000000136400000000e4d20cc8dcd2b752000000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-056.phpt b/tests/bson-corpus/decimal128-2-valid-056.phpt index 2162373dd..e64bdf9d5 100644 --- a/tests/bson-corpus/decimal128-2-valid-056.phpt +++ b/tests/bson-corpus/decimal128-2-valid-056.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000000004A48011416954508000000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.0000000000000000000000000E+6136"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000000004a48011416954508000000fe5f00 -180000001364000000004a48011416954508000000fe5f00 -{"d":{"$numberDecimal":"1.0000000000000000000000000E+6136"}} {"d":{"$numberDecimal":"1.0000000000000000000000000E+6136"}} 180000001364000000004a48011416954508000000fe5f00 -180000001364000000004a48011416954508000000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-057.phpt b/tests/bson-corpus/decimal128-2-valid-057.phpt index 05793cd5e..89fbc1b9b 100644 --- a/tests/bson-corpus/decimal128-2-valid-057.phpt +++ b/tests/bson-corpus/decimal128-2-valid-057.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400000000A1EDCCCE1BC2D300000000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.000000000000000000000000E+6135"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400000000a1edccce1bc2d300000000fe5f00 -18000000136400000000a1edccce1bc2d300000000fe5f00 -{"d":{"$numberDecimal":"1.000000000000000000000000E+6135"}} {"d":{"$numberDecimal":"1.000000000000000000000000E+6135"}} 18000000136400000000a1edccce1bc2d300000000fe5f00 -18000000136400000000a1edccce1bc2d300000000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-058.phpt b/tests/bson-corpus/decimal128-2-valid-058.phpt index a5b2d1d38..1c4352e5e 100644 --- a/tests/bson-corpus/decimal128-2-valid-058.phpt +++ b/tests/bson-corpus/decimal128-2-valid-058.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400000080F64AE1C7022D1500000000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.00000000000000000000000E+6134"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400000080f64ae1c7022d1500000000fe5f00 -18000000136400000080f64ae1c7022d1500000000fe5f00 -{"d":{"$numberDecimal":"1.00000000000000000000000E+6134"}} {"d":{"$numberDecimal":"1.00000000000000000000000E+6134"}} 18000000136400000080f64ae1c7022d1500000000fe5f00 -18000000136400000080f64ae1c7022d1500000000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-059.phpt b/tests/bson-corpus/decimal128-2-valid-059.phpt index 316c6b8b3..d40627656 100644 --- a/tests/bson-corpus/decimal128-2-valid-059.phpt +++ b/tests/bson-corpus/decimal128-2-valid-059.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400000040B2BAC9E0191E0200000000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.0000000000000000000000E+6133"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400000040b2bac9e0191e0200000000fe5f00 -18000000136400000040b2bac9e0191e0200000000fe5f00 -{"d":{"$numberDecimal":"1.0000000000000000000000E+6133"}} {"d":{"$numberDecimal":"1.0000000000000000000000E+6133"}} 18000000136400000040b2bac9e0191e0200000000fe5f00 -18000000136400000040b2bac9e0191e0200000000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-060.phpt b/tests/bson-corpus/decimal128-2-valid-060.phpt index 166847138..32322b95d 100644 --- a/tests/bson-corpus/decimal128-2-valid-060.phpt +++ b/tests/bson-corpus/decimal128-2-valid-060.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000000A0DEC5ADC935360000000000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.000000000000000000000E+6132"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000000a0dec5adc935360000000000fe5f00 -180000001364000000a0dec5adc935360000000000fe5f00 -{"d":{"$numberDecimal":"1.000000000000000000000E+6132"}} {"d":{"$numberDecimal":"1.000000000000000000000E+6132"}} 180000001364000000a0dec5adc935360000000000fe5f00 -180000001364000000a0dec5adc935360000000000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-061.phpt b/tests/bson-corpus/decimal128-2-valid-061.phpt index f6bdb70a8..71a763511 100644 --- a/tests/bson-corpus/decimal128-2-valid-061.phpt +++ b/tests/bson-corpus/decimal128-2-valid-061.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400000010632D5EC76B050000000000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.00000000000000000000E+6131"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400000010632d5ec76b050000000000fe5f00 -18000000136400000010632d5ec76b050000000000fe5f00 -{"d":{"$numberDecimal":"1.00000000000000000000E+6131"}} {"d":{"$numberDecimal":"1.00000000000000000000E+6131"}} 18000000136400000010632d5ec76b050000000000fe5f00 -18000000136400000010632d5ec76b050000000000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-062.phpt b/tests/bson-corpus/decimal128-2-valid-062.phpt index 52b69f8b5..c6f460e82 100644 --- a/tests/bson-corpus/decimal128-2-valid-062.phpt +++ b/tests/bson-corpus/decimal128-2-valid-062.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000000E8890423C78A000000000000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.0000000000000000000E+6130"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000000e8890423c78a000000000000fe5f00 -180000001364000000e8890423c78a000000000000fe5f00 -{"d":{"$numberDecimal":"1.0000000000000000000E+6130"}} {"d":{"$numberDecimal":"1.0000000000000000000E+6130"}} 180000001364000000e8890423c78a000000000000fe5f00 -180000001364000000e8890423c78a000000000000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-063.phpt b/tests/bson-corpus/decimal128-2-valid-063.phpt index 362ed8d1c..d1fb7d1f4 100644 --- a/tests/bson-corpus/decimal128-2-valid-063.phpt +++ b/tests/bson-corpus/decimal128-2-valid-063.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400000064A7B3B6E00D000000000000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.000000000000000000E+6129"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400000064a7b3b6e00d000000000000fe5f00 -18000000136400000064a7b3b6e00d000000000000fe5f00 -{"d":{"$numberDecimal":"1.000000000000000000E+6129"}} {"d":{"$numberDecimal":"1.000000000000000000E+6129"}} 18000000136400000064a7b3b6e00d000000000000fe5f00 -18000000136400000064a7b3b6e00d000000000000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-064.phpt b/tests/bson-corpus/decimal128-2-valid-064.phpt index 19ded28b9..a9f08d30d 100644 --- a/tests/bson-corpus/decimal128-2-valid-064.phpt +++ b/tests/bson-corpus/decimal128-2-valid-064.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1800000013640000008A5D78456301000000000000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.00000000000000000E+6128"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1800000013640000008a5d78456301000000000000fe5f00 -1800000013640000008a5d78456301000000000000fe5f00 -{"d":{"$numberDecimal":"1.00000000000000000E+6128"}} {"d":{"$numberDecimal":"1.00000000000000000E+6128"}} 1800000013640000008a5d78456301000000000000fe5f00 -1800000013640000008a5d78456301000000000000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-065.phpt b/tests/bson-corpus/decimal128-2-valid-065.phpt index 60071fb64..8ec962644 100644 --- a/tests/bson-corpus/decimal128-2-valid-065.phpt +++ b/tests/bson-corpus/decimal128-2-valid-065.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000000C16FF2862300000000000000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.0000000000000000E+6127"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000000c16ff2862300000000000000fe5f00 -180000001364000000c16ff2862300000000000000fe5f00 -{"d":{"$numberDecimal":"1.0000000000000000E+6127"}} {"d":{"$numberDecimal":"1.0000000000000000E+6127"}} 180000001364000000c16ff2862300000000000000fe5f00 -180000001364000000c16ff2862300000000000000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-066.phpt b/tests/bson-corpus/decimal128-2-valid-066.phpt index 57c6c8e75..edb10c3b8 100644 --- a/tests/bson-corpus/decimal128-2-valid-066.phpt +++ b/tests/bson-corpus/decimal128-2-valid-066.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000080C6A47E8D0300000000000000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.000000000000000E+6126"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000080c6a47e8d0300000000000000fe5f00 -180000001364000080c6a47e8d0300000000000000fe5f00 -{"d":{"$numberDecimal":"1.000000000000000E+6126"}} {"d":{"$numberDecimal":"1.000000000000000E+6126"}} 180000001364000080c6a47e8d0300000000000000fe5f00 -180000001364000080c6a47e8d0300000000000000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-067.phpt b/tests/bson-corpus/decimal128-2-valid-067.phpt index c80a649fe..fe3269da9 100644 --- a/tests/bson-corpus/decimal128-2-valid-067.phpt +++ b/tests/bson-corpus/decimal128-2-valid-067.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1800000013640000407A10F35A0000000000000000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.00000000000000E+6125"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1800000013640000407a10f35a0000000000000000fe5f00 -1800000013640000407a10f35a0000000000000000fe5f00 -{"d":{"$numberDecimal":"1.00000000000000E+6125"}} {"d":{"$numberDecimal":"1.00000000000000E+6125"}} 1800000013640000407a10f35a0000000000000000fe5f00 -1800000013640000407a10f35a0000000000000000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-068.phpt b/tests/bson-corpus/decimal128-2-valid-068.phpt index 186db7e1d..f23361bb4 100644 --- a/tests/bson-corpus/decimal128-2-valid-068.phpt +++ b/tests/bson-corpus/decimal128-2-valid-068.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1800000013640000A0724E18090000000000000000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.0000000000000E+6124"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1800000013640000a0724e18090000000000000000fe5f00 -1800000013640000a0724e18090000000000000000fe5f00 -{"d":{"$numberDecimal":"1.0000000000000E+6124"}} {"d":{"$numberDecimal":"1.0000000000000E+6124"}} 1800000013640000a0724e18090000000000000000fe5f00 -1800000013640000a0724e18090000000000000000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-069.phpt b/tests/bson-corpus/decimal128-2-valid-069.phpt index 4531f1847..3b2c3d0ab 100644 --- a/tests/bson-corpus/decimal128-2-valid-069.phpt +++ b/tests/bson-corpus/decimal128-2-valid-069.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000010A5D4E8000000000000000000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.000000000000E+6123"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000010a5d4e8000000000000000000fe5f00 -180000001364000010a5d4e8000000000000000000fe5f00 -{"d":{"$numberDecimal":"1.000000000000E+6123"}} {"d":{"$numberDecimal":"1.000000000000E+6123"}} 180000001364000010a5d4e8000000000000000000fe5f00 -180000001364000010a5d4e8000000000000000000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-070.phpt b/tests/bson-corpus/decimal128-2-valid-070.phpt index 42b3f17fe..a21030d95 100644 --- a/tests/bson-corpus/decimal128-2-valid-070.phpt +++ b/tests/bson-corpus/decimal128-2-valid-070.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1800000013640000E8764817000000000000000000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.00000000000E+6122"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1800000013640000e8764817000000000000000000fe5f00 -1800000013640000e8764817000000000000000000fe5f00 -{"d":{"$numberDecimal":"1.00000000000E+6122"}} {"d":{"$numberDecimal":"1.00000000000E+6122"}} 1800000013640000e8764817000000000000000000fe5f00 -1800000013640000e8764817000000000000000000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-071.phpt b/tests/bson-corpus/decimal128-2-valid-071.phpt index 49c7297f4..9f089d67b 100644 --- a/tests/bson-corpus/decimal128-2-valid-071.phpt +++ b/tests/bson-corpus/decimal128-2-valid-071.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1800000013640000E40B5402000000000000000000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.0000000000E+6121"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1800000013640000e40b5402000000000000000000fe5f00 -1800000013640000e40b5402000000000000000000fe5f00 -{"d":{"$numberDecimal":"1.0000000000E+6121"}} {"d":{"$numberDecimal":"1.0000000000E+6121"}} 1800000013640000e40b5402000000000000000000fe5f00 -1800000013640000e40b5402000000000000000000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-072.phpt b/tests/bson-corpus/decimal128-2-valid-072.phpt index aa6b56de9..ef647425d 100644 --- a/tests/bson-corpus/decimal128-2-valid-072.phpt +++ b/tests/bson-corpus/decimal128-2-valid-072.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1800000013640000CA9A3B00000000000000000000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.000000000E+6120"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1800000013640000ca9a3b00000000000000000000fe5f00 -1800000013640000ca9a3b00000000000000000000fe5f00 -{"d":{"$numberDecimal":"1.000000000E+6120"}} {"d":{"$numberDecimal":"1.000000000E+6120"}} 1800000013640000ca9a3b00000000000000000000fe5f00 -1800000013640000ca9a3b00000000000000000000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-073.phpt b/tests/bson-corpus/decimal128-2-valid-073.phpt index c76361c68..cf141536b 100644 --- a/tests/bson-corpus/decimal128-2-valid-073.phpt +++ b/tests/bson-corpus/decimal128-2-valid-073.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1800000013640000E1F50500000000000000000000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.00000000E+6119"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1800000013640000e1f50500000000000000000000fe5f00 -1800000013640000e1f50500000000000000000000fe5f00 -{"d":{"$numberDecimal":"1.00000000E+6119"}} {"d":{"$numberDecimal":"1.00000000E+6119"}} 1800000013640000e1f50500000000000000000000fe5f00 -1800000013640000e1f50500000000000000000000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-074.phpt b/tests/bson-corpus/decimal128-2-valid-074.phpt index 8c47553b2..2265d2e0e 100644 --- a/tests/bson-corpus/decimal128-2-valid-074.phpt +++ b/tests/bson-corpus/decimal128-2-valid-074.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364008096980000000000000000000000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.0000000E+6118"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364008096980000000000000000000000fe5f00 -180000001364008096980000000000000000000000fe5f00 -{"d":{"$numberDecimal":"1.0000000E+6118"}} {"d":{"$numberDecimal":"1.0000000E+6118"}} 180000001364008096980000000000000000000000fe5f00 -180000001364008096980000000000000000000000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-075.phpt b/tests/bson-corpus/decimal128-2-valid-075.phpt index dd48c68ff..aafe287d7 100644 --- a/tests/bson-corpus/decimal128-2-valid-075.phpt +++ b/tests/bson-corpus/decimal128-2-valid-075.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1800000013640040420F0000000000000000000000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.000000E+6117"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1800000013640040420f0000000000000000000000fe5f00 -1800000013640040420f0000000000000000000000fe5f00 -{"d":{"$numberDecimal":"1.000000E+6117"}} {"d":{"$numberDecimal":"1.000000E+6117"}} 1800000013640040420f0000000000000000000000fe5f00 -1800000013640040420f0000000000000000000000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-076.phpt b/tests/bson-corpus/decimal128-2-valid-076.phpt index 28a039569..1f9211017 100644 --- a/tests/bson-corpus/decimal128-2-valid-076.phpt +++ b/tests/bson-corpus/decimal128-2-valid-076.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400A086010000000000000000000000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.00000E+6116"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400a086010000000000000000000000fe5f00 -18000000136400a086010000000000000000000000fe5f00 -{"d":{"$numberDecimal":"1.00000E+6116"}} {"d":{"$numberDecimal":"1.00000E+6116"}} 18000000136400a086010000000000000000000000fe5f00 -18000000136400a086010000000000000000000000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-077.phpt b/tests/bson-corpus/decimal128-2-valid-077.phpt index 9a20a42f2..4cf1a9426 100644 --- a/tests/bson-corpus/decimal128-2-valid-077.phpt +++ b/tests/bson-corpus/decimal128-2-valid-077.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364001027000000000000000000000000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.0000E+6115"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364001027000000000000000000000000fe5f00 -180000001364001027000000000000000000000000fe5f00 -{"d":{"$numberDecimal":"1.0000E+6115"}} {"d":{"$numberDecimal":"1.0000E+6115"}} 180000001364001027000000000000000000000000fe5f00 -180000001364001027000000000000000000000000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-078.phpt b/tests/bson-corpus/decimal128-2-valid-078.phpt index 9b89f1ceb..cfdba4de2 100644 --- a/tests/bson-corpus/decimal128-2-valid-078.phpt +++ b/tests/bson-corpus/decimal128-2-valid-078.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400E803000000000000000000000000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.000E+6114"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400e803000000000000000000000000fe5f00 -18000000136400e803000000000000000000000000fe5f00 -{"d":{"$numberDecimal":"1.000E+6114"}} {"d":{"$numberDecimal":"1.000E+6114"}} 18000000136400e803000000000000000000000000fe5f00 -18000000136400e803000000000000000000000000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-079.phpt b/tests/bson-corpus/decimal128-2-valid-079.phpt index b3c968c67..a74d6d546 100644 --- a/tests/bson-corpus/decimal128-2-valid-079.phpt +++ b/tests/bson-corpus/decimal128-2-valid-079.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364006400000000000000000000000000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.00E+6113"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364006400000000000000000000000000fe5f00 -180000001364006400000000000000000000000000fe5f00 -{"d":{"$numberDecimal":"1.00E+6113"}} {"d":{"$numberDecimal":"1.00E+6113"}} 180000001364006400000000000000000000000000fe5f00 -180000001364006400000000000000000000000000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-080.phpt b/tests/bson-corpus/decimal128-2-valid-080.phpt index c4b5c7686..6d36a2798 100644 --- a/tests/bson-corpus/decimal128-2-valid-080.phpt +++ b/tests/bson-corpus/decimal128-2-valid-080.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000A00000000000000000000000000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.0E+6112"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000a00000000000000000000000000fe5f00 -180000001364000a00000000000000000000000000fe5f00 -{"d":{"$numberDecimal":"1.0E+6112"}} {"d":{"$numberDecimal":"1.0E+6112"}} 180000001364000a00000000000000000000000000fe5f00 -180000001364000a00000000000000000000000000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-081.phpt b/tests/bson-corpus/decimal128-2-valid-081.phpt index c4f5009f2..f459a7e54 100644 --- a/tests/bson-corpus/decimal128-2-valid-081.phpt +++ b/tests/bson-corpus/decimal128-2-valid-081.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000100000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000100000000000000000000000000403000 -180000001364000100000000000000000000000000403000 -{"d":{"$numberDecimal":"1"}} {"d":{"$numberDecimal":"1"}} 180000001364000100000000000000000000000000403000 -180000001364000100000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-082.phpt b/tests/bson-corpus/decimal128-2-valid-082.phpt index eec68f14f..5251250ec 100644 --- a/tests/bson-corpus/decimal128-2-valid-082.phpt +++ b/tests/bson-corpus/decimal128-2-valid-082.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000100000000000000000000000000FC5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1E+6110"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000100000000000000000000000000fc5f00 -180000001364000100000000000000000000000000fc5f00 -{"d":{"$numberDecimal":"1E+6110"}} {"d":{"$numberDecimal":"1E+6110"}} 180000001364000100000000000000000000000000fc5f00 -180000001364000100000000000000000000000000fc5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-083.phpt b/tests/bson-corpus/decimal128-2-valid-083.phpt index caa69444a..fa9fd5381 100644 --- a/tests/bson-corpus/decimal128-2-valid-083.phpt +++ b/tests/bson-corpus/decimal128-2-valid-083.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000100000000000000000000000000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1E+6111"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000100000000000000000000000000fe5f00 -180000001364000100000000000000000000000000fe5f00 -{"d":{"$numberDecimal":"1E+6111"}} {"d":{"$numberDecimal":"1E+6111"}} 180000001364000100000000000000000000000000fe5f00 -180000001364000100000000000000000000000000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-084.phpt b/tests/bson-corpus/decimal128-2-valid-084.phpt index 87e8b5ae2..82bcfe436 100644 --- a/tests/bson-corpus/decimal128-2-valid-084.phpt +++ b/tests/bson-corpus/decimal128-2-valid-084.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000100000000000000000000000000420000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1E-6143"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000100000000000000000000000000420000 -180000001364000100000000000000000000000000420000 -{"d":{"$numberDecimal":"1E-6143"}} {"d":{"$numberDecimal":"1E-6143"}} 180000001364000100000000000000000000000000420000 -180000001364000100000000000000000000000000420000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-085.phpt b/tests/bson-corpus/decimal128-2-valid-085.phpt index b7c639b07..8be9f71e6 100644 --- a/tests/bson-corpus/decimal128-2-valid-085.phpt +++ b/tests/bson-corpus/decimal128-2-valid-085.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400010000000A5BC138938D44C64D31000000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.000000000000000000000000000000001E-6143"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400010000000a5bc138938d44c64d31000000 -18000000136400010000000a5bc138938d44c64d31000000 -{"d":{"$numberDecimal":"1.000000000000000000000000000000001E-6143"}} {"d":{"$numberDecimal":"1.000000000000000000000000000000001E-6143"}} 18000000136400010000000a5bc138938d44c64d31000000 -18000000136400010000000a5bc138938d44c64d31000000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-086.phpt b/tests/bson-corpus/decimal128-2-valid-086.phpt index 2c4ac9685..a8614d05d 100644 --- a/tests/bson-corpus/decimal128-2-valid-086.phpt +++ b/tests/bson-corpus/decimal128-2-valid-086.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400000000807F1BCF85B27059C8A43CFE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.230000000000000000000000000000000E+6144"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400000000807f1bcf85b27059c8a43cfe5f00 -18000000136400000000807f1bcf85b27059c8a43cfe5f00 -{"d":{"$numberDecimal":"1.230000000000000000000000000000000E+6144"}} {"d":{"$numberDecimal":"1.230000000000000000000000000000000E+6144"}} 18000000136400000000807f1bcf85b27059c8a43cfe5f00 -18000000136400000000807f1bcf85b27059c8a43cfe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-087.phpt b/tests/bson-corpus/decimal128-2-valid-087.phpt index 1f26def95..3c97a91aa 100644 --- a/tests/bson-corpus/decimal128-2-valid-087.phpt +++ b/tests/bson-corpus/decimal128-2-valid-087.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364007B000000000000000000000000003C3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.23"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364007b000000000000000000000000003c3000 -180000001364007b000000000000000000000000003c3000 -{"d":{"$numberDecimal":"1.23"}} {"d":{"$numberDecimal":"1.23"}} 180000001364007b000000000000000000000000003c3000 -180000001364007b000000000000000000000000003c3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-088.phpt b/tests/bson-corpus/decimal128-2-valid-088.phpt index f12423ae7..74cfe2604 100644 --- a/tests/bson-corpus/decimal128-2-valid-088.phpt +++ b/tests/bson-corpus/decimal128-2-valid-088.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400F2AF967ED05C82DE3297FF6FDE3CFE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.234567890123456789012345678901234E+6144"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400f2af967ed05c82de3297ff6fde3cfe5f00 -18000000136400f2af967ed05c82de3297ff6fde3cfe5f00 -{"d":{"$numberDecimal":"1.234567890123456789012345678901234E+6144"}} {"d":{"$numberDecimal":"1.234567890123456789012345678901234E+6144"}} 18000000136400f2af967ed05c82de3297ff6fde3cfe5f00 -18000000136400f2af967ed05c82de3297ff6fde3cfe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-089.phpt b/tests/bson-corpus/decimal128-2-valid-089.phpt index afcb42053..d47a6bf8a 100644 --- a/tests/bson-corpus/decimal128-2-valid-089.phpt +++ b/tests/bson-corpus/decimal128-2-valid-089.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000700000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "7"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000700000000000000000000000000403000 -180000001364000700000000000000000000000000403000 -{"d":{"$numberDecimal":"7"}} {"d":{"$numberDecimal":"7"}} 180000001364000700000000000000000000000000403000 -180000001364000700000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-090.phpt b/tests/bson-corpus/decimal128-2-valid-090.phpt index 05ac8c434..90c076a35 100644 --- a/tests/bson-corpus/decimal128-2-valid-090.phpt +++ b/tests/bson-corpus/decimal128-2-valid-090.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1800000013640007000000000000000000000000001E5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "7E+5999"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1800000013640007000000000000000000000000001e5f00 -1800000013640007000000000000000000000000001e5f00 -{"d":{"$numberDecimal":"7E+5999"}} {"d":{"$numberDecimal":"7E+5999"}} 1800000013640007000000000000000000000000001e5f00 -1800000013640007000000000000000000000000001e5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-091.phpt b/tests/bson-corpus/decimal128-2-valid-091.phpt index 7fb0618c2..75bc0456b 100644 --- a/tests/bson-corpus/decimal128-2-valid-091.phpt +++ b/tests/bson-corpus/decimal128-2-valid-091.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1800000013640007000000000000000000000000000E3800'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "7E+999"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1800000013640007000000000000000000000000000e3800 -1800000013640007000000000000000000000000000e3800 -{"d":{"$numberDecimal":"7E+999"}} {"d":{"$numberDecimal":"7E+999"}} 1800000013640007000000000000000000000000000e3800 -1800000013640007000000000000000000000000000e3800 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-092.phpt b/tests/bson-corpus/decimal128-2-valid-092.phpt index b2ebaa56a..b917f3da8 100644 --- a/tests/bson-corpus/decimal128-2-valid-092.phpt +++ b/tests/bson-corpus/decimal128-2-valid-092.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000700000000000000000000000000063100'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "7E+99"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000700000000000000000000000000063100 -180000001364000700000000000000000000000000063100 -{"d":{"$numberDecimal":"7E+99"}} {"d":{"$numberDecimal":"7E+99"}} 180000001364000700000000000000000000000000063100 -180000001364000700000000000000000000000000063100 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-093.phpt b/tests/bson-corpus/decimal128-2-valid-093.phpt index ca34616a8..62a096e5d 100644 --- a/tests/bson-corpus/decimal128-2-valid-093.phpt +++ b/tests/bson-corpus/decimal128-2-valid-093.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000700000000000000000000000000523000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "7E+9"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000700000000000000000000000000523000 -180000001364000700000000000000000000000000523000 -{"d":{"$numberDecimal":"7E+9"}} {"d":{"$numberDecimal":"7E+9"}} 180000001364000700000000000000000000000000523000 -180000001364000700000000000000000000000000523000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-094.phpt b/tests/bson-corpus/decimal128-2-valid-094.phpt index 9af8d9bab..c3fa35b96 100644 --- a/tests/bson-corpus/decimal128-2-valid-094.phpt +++ b/tests/bson-corpus/decimal128-2-valid-094.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000000FED83F4E7C9FE4E269E38A5BCD1700'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "7.049000000000010795488000000000000E-3097"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000000fed83f4e7c9fe4e269e38a5bcd1700 -180000001364000000fed83f4e7c9fe4e269e38a5bcd1700 -{"d":{"$numberDecimal":"7.049000000000010795488000000000000E-3097"}} {"d":{"$numberDecimal":"7.049000000000010795488000000000000E-3097"}} 180000001364000000fed83f4e7c9fe4e269e38a5bcd1700 -180000001364000000fed83f4e7c9fe4e269e38a5bcd1700 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-095.phpt b/tests/bson-corpus/decimal128-2-valid-095.phpt index 267f0e060..2ba1a5d9e 100644 --- a/tests/bson-corpus/decimal128-2-valid-095.phpt +++ b/tests/bson-corpus/decimal128-2-valid-095.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000000203B9DB5056F000000000000002400'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "8.000000000000000000E-1550"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000000203b9db5056f000000000000002400 -180000001364000000203b9db5056f000000000000002400 -{"d":{"$numberDecimal":"8.000000000000000000E-1550"}} {"d":{"$numberDecimal":"8.000000000000000000E-1550"}} 180000001364000000203b9db5056f000000000000002400 -180000001364000000203b9db5056f000000000000002400 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-096.phpt b/tests/bson-corpus/decimal128-2-valid-096.phpt index 68460b936..c45616518 100644 --- a/tests/bson-corpus/decimal128-2-valid-096.phpt +++ b/tests/bson-corpus/decimal128-2-valid-096.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364003C17258419D710C42F0000000000002400'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "8.81125000000001349436E-1548"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364003c17258419d710c42f0000000000002400 -180000001364003c17258419d710c42f0000000000002400 -{"d":{"$numberDecimal":"8.81125000000001349436E-1548"}} {"d":{"$numberDecimal":"8.81125000000001349436E-1548"}} 180000001364003c17258419d710c42f0000000000002400 -180000001364003c17258419d710c42f0000000000002400 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-097.phpt b/tests/bson-corpus/decimal128-2-valid-097.phpt index ab1002f05..c05b7ca2d 100644 --- a/tests/bson-corpus/decimal128-2-valid-097.phpt +++ b/tests/bson-corpus/decimal128-2-valid-097.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000900000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "9"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000900000000000000000000000000403000 -180000001364000900000000000000000000000000403000 -{"d":{"$numberDecimal":"9"}} {"d":{"$numberDecimal":"9"}} 180000001364000900000000000000000000000000403000 -180000001364000900000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-098.phpt b/tests/bson-corpus/decimal128-2-valid-098.phpt index a074d4dd8..fd44588ce 100644 --- a/tests/bson-corpus/decimal128-2-valid-098.phpt +++ b/tests/bson-corpus/decimal128-2-valid-098.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400FFFFFFFF638E8D37C087ADBE09EDFF5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "9.999999999999999999999999999999999E+6144"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400ffffffff638e8d37c087adbe09edff5f00 -18000000136400ffffffff638e8d37c087adbe09edff5f00 -{"d":{"$numberDecimal":"9.999999999999999999999999999999999E+6144"}} {"d":{"$numberDecimal":"9.999999999999999999999999999999999E+6144"}} 18000000136400ffffffff638e8d37c087adbe09edff5f00 -18000000136400ffffffff638e8d37c087adbe09edff5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-099.phpt b/tests/bson-corpus/decimal128-2-valid-099.phpt index 82133ec5c..3c5e4ce65 100644 --- a/tests/bson-corpus/decimal128-2-valid-099.phpt +++ b/tests/bson-corpus/decimal128-2-valid-099.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000A00000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "10"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000a00000000000000000000000000403000 -180000001364000a00000000000000000000000000403000 -{"d":{"$numberDecimal":"10"}} {"d":{"$numberDecimal":"10"}} 180000001364000a00000000000000000000000000403000 -180000001364000a00000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-100.phpt b/tests/bson-corpus/decimal128-2-valid-100.phpt index 0d7a3b770..38893a38f 100644 --- a/tests/bson-corpus/decimal128-2-valid-100.phpt +++ b/tests/bson-corpus/decimal128-2-valid-100.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000C00000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "12"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000c00000000000000000000000000403000 -180000001364000c00000000000000000000000000403000 -{"d":{"$numberDecimal":"12"}} {"d":{"$numberDecimal":"12"}} 180000001364000c00000000000000000000000000403000 -180000001364000c00000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-101.phpt b/tests/bson-corpus/decimal128-2-valid-101.phpt index 8f7690945..add884f63 100644 --- a/tests/bson-corpus/decimal128-2-valid-101.phpt +++ b/tests/bson-corpus/decimal128-2-valid-101.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364001300000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "19"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364001300000000000000000000000000403000 -180000001364001300000000000000000000000000403000 -{"d":{"$numberDecimal":"19"}} {"d":{"$numberDecimal":"19"}} 180000001364001300000000000000000000000000403000 -180000001364001300000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-102.phpt b/tests/bson-corpus/decimal128-2-valid-102.phpt index e6bfe3e26..7d4fd53fe 100644 --- a/tests/bson-corpus/decimal128-2-valid-102.phpt +++ b/tests/bson-corpus/decimal128-2-valid-102.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364001400000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "20"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364001400000000000000000000000000403000 -180000001364001400000000000000000000000000403000 -{"d":{"$numberDecimal":"20"}} {"d":{"$numberDecimal":"20"}} 180000001364001400000000000000000000000000403000 -180000001364001400000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-103.phpt b/tests/bson-corpus/decimal128-2-valid-103.phpt index 09e4b2ed4..1d0b1a213 100644 --- a/tests/bson-corpus/decimal128-2-valid-103.phpt +++ b/tests/bson-corpus/decimal128-2-valid-103.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364001D00000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "29"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364001d00000000000000000000000000403000 -180000001364001d00000000000000000000000000403000 -{"d":{"$numberDecimal":"29"}} {"d":{"$numberDecimal":"29"}} 180000001364001d00000000000000000000000000403000 -180000001364001d00000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-104.phpt b/tests/bson-corpus/decimal128-2-valid-104.phpt index dcbfe7ad7..7b43dd37c 100644 --- a/tests/bson-corpus/decimal128-2-valid-104.phpt +++ b/tests/bson-corpus/decimal128-2-valid-104.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364001E00000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "30"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364001e00000000000000000000000000403000 -180000001364001e00000000000000000000000000403000 -{"d":{"$numberDecimal":"30"}} {"d":{"$numberDecimal":"30"}} 180000001364001e00000000000000000000000000403000 -180000001364001e00000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-105.phpt b/tests/bson-corpus/decimal128-2-valid-105.phpt index 7a94261a8..cb5feb79d 100644 --- a/tests/bson-corpus/decimal128-2-valid-105.phpt +++ b/tests/bson-corpus/decimal128-2-valid-105.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364002700000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "39"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364002700000000000000000000000000403000 -180000001364002700000000000000000000000000403000 -{"d":{"$numberDecimal":"39"}} {"d":{"$numberDecimal":"39"}} 180000001364002700000000000000000000000000403000 -180000001364002700000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-106.phpt b/tests/bson-corpus/decimal128-2-valid-106.phpt index 283b881aa..c272f70c8 100644 --- a/tests/bson-corpus/decimal128-2-valid-106.phpt +++ b/tests/bson-corpus/decimal128-2-valid-106.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364002800000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "40"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364002800000000000000000000000000403000 -180000001364002800000000000000000000000000403000 -{"d":{"$numberDecimal":"40"}} {"d":{"$numberDecimal":"40"}} 180000001364002800000000000000000000000000403000 -180000001364002800000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-107.phpt b/tests/bson-corpus/decimal128-2-valid-107.phpt index b005693d5..2b322e530 100644 --- a/tests/bson-corpus/decimal128-2-valid-107.phpt +++ b/tests/bson-corpus/decimal128-2-valid-107.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364003100000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "49"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364003100000000000000000000000000403000 -180000001364003100000000000000000000000000403000 -{"d":{"$numberDecimal":"49"}} {"d":{"$numberDecimal":"49"}} 180000001364003100000000000000000000000000403000 -180000001364003100000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-108.phpt b/tests/bson-corpus/decimal128-2-valid-108.phpt index eb8497667..a974d39a9 100644 --- a/tests/bson-corpus/decimal128-2-valid-108.phpt +++ b/tests/bson-corpus/decimal128-2-valid-108.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364003200000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "50"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364003200000000000000000000000000403000 -180000001364003200000000000000000000000000403000 -{"d":{"$numberDecimal":"50"}} {"d":{"$numberDecimal":"50"}} 180000001364003200000000000000000000000000403000 -180000001364003200000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-109.phpt b/tests/bson-corpus/decimal128-2-valid-109.phpt index 2ce7764ee..2cc164fe9 100644 --- a/tests/bson-corpus/decimal128-2-valid-109.phpt +++ b/tests/bson-corpus/decimal128-2-valid-109.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364003B00000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "59"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364003b00000000000000000000000000403000 -180000001364003b00000000000000000000000000403000 -{"d":{"$numberDecimal":"59"}} {"d":{"$numberDecimal":"59"}} 180000001364003b00000000000000000000000000403000 -180000001364003b00000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-110.phpt b/tests/bson-corpus/decimal128-2-valid-110.phpt index 1a350a182..3ed7200f2 100644 --- a/tests/bson-corpus/decimal128-2-valid-110.phpt +++ b/tests/bson-corpus/decimal128-2-valid-110.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364003C00000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "60"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364003c00000000000000000000000000403000 -180000001364003c00000000000000000000000000403000 -{"d":{"$numberDecimal":"60"}} {"d":{"$numberDecimal":"60"}} 180000001364003c00000000000000000000000000403000 -180000001364003c00000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-111.phpt b/tests/bson-corpus/decimal128-2-valid-111.phpt index 41b3e7ef3..b8f1ffb38 100644 --- a/tests/bson-corpus/decimal128-2-valid-111.phpt +++ b/tests/bson-corpus/decimal128-2-valid-111.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364004500000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "69"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364004500000000000000000000000000403000 -180000001364004500000000000000000000000000403000 -{"d":{"$numberDecimal":"69"}} {"d":{"$numberDecimal":"69"}} 180000001364004500000000000000000000000000403000 -180000001364004500000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-112.phpt b/tests/bson-corpus/decimal128-2-valid-112.phpt index 84c113a48..5abab23b4 100644 --- a/tests/bson-corpus/decimal128-2-valid-112.phpt +++ b/tests/bson-corpus/decimal128-2-valid-112.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364004600000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "70"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364004600000000000000000000000000403000 -180000001364004600000000000000000000000000403000 -{"d":{"$numberDecimal":"70"}} {"d":{"$numberDecimal":"70"}} 180000001364004600000000000000000000000000403000 -180000001364004600000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-113.phpt b/tests/bson-corpus/decimal128-2-valid-113.phpt index 297a992a5..e18b44cbb 100644 --- a/tests/bson-corpus/decimal128-2-valid-113.phpt +++ b/tests/bson-corpus/decimal128-2-valid-113.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364004700000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "71"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364004700000000000000000000000000403000 -180000001364004700000000000000000000000000403000 -{"d":{"$numberDecimal":"71"}} {"d":{"$numberDecimal":"71"}} 180000001364004700000000000000000000000000403000 -180000001364004700000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-114.phpt b/tests/bson-corpus/decimal128-2-valid-114.phpt index c77b5d84c..ec34e8e81 100644 --- a/tests/bson-corpus/decimal128-2-valid-114.phpt +++ b/tests/bson-corpus/decimal128-2-valid-114.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364004800000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "72"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364004800000000000000000000000000403000 -180000001364004800000000000000000000000000403000 -{"d":{"$numberDecimal":"72"}} {"d":{"$numberDecimal":"72"}} 180000001364004800000000000000000000000000403000 -180000001364004800000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-115.phpt b/tests/bson-corpus/decimal128-2-valid-115.phpt index 565744f7f..3df80e8b4 100644 --- a/tests/bson-corpus/decimal128-2-valid-115.phpt +++ b/tests/bson-corpus/decimal128-2-valid-115.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364004900000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "73"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364004900000000000000000000000000403000 -180000001364004900000000000000000000000000403000 -{"d":{"$numberDecimal":"73"}} {"d":{"$numberDecimal":"73"}} 180000001364004900000000000000000000000000403000 -180000001364004900000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-116.phpt b/tests/bson-corpus/decimal128-2-valid-116.phpt index 3e4492725..3daf4a359 100644 --- a/tests/bson-corpus/decimal128-2-valid-116.phpt +++ b/tests/bson-corpus/decimal128-2-valid-116.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364004A00000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "74"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364004a00000000000000000000000000403000 -180000001364004a00000000000000000000000000403000 -{"d":{"$numberDecimal":"74"}} {"d":{"$numberDecimal":"74"}} 180000001364004a00000000000000000000000000403000 -180000001364004a00000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-117.phpt b/tests/bson-corpus/decimal128-2-valid-117.phpt index 9139ce7de..3f637c12b 100644 --- a/tests/bson-corpus/decimal128-2-valid-117.phpt +++ b/tests/bson-corpus/decimal128-2-valid-117.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364004B00000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "75"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364004b00000000000000000000000000403000 -180000001364004b00000000000000000000000000403000 -{"d":{"$numberDecimal":"75"}} {"d":{"$numberDecimal":"75"}} 180000001364004b00000000000000000000000000403000 -180000001364004b00000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-118.phpt b/tests/bson-corpus/decimal128-2-valid-118.phpt index c24c6ca3f..c1235569e 100644 --- a/tests/bson-corpus/decimal128-2-valid-118.phpt +++ b/tests/bson-corpus/decimal128-2-valid-118.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364004C00000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "76"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364004c00000000000000000000000000403000 -180000001364004c00000000000000000000000000403000 -{"d":{"$numberDecimal":"76"}} {"d":{"$numberDecimal":"76"}} 180000001364004c00000000000000000000000000403000 -180000001364004c00000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-119.phpt b/tests/bson-corpus/decimal128-2-valid-119.phpt index 9b5200905..7192fbc50 100644 --- a/tests/bson-corpus/decimal128-2-valid-119.phpt +++ b/tests/bson-corpus/decimal128-2-valid-119.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364004D00000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "77"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364004d00000000000000000000000000403000 -180000001364004d00000000000000000000000000403000 -{"d":{"$numberDecimal":"77"}} {"d":{"$numberDecimal":"77"}} 180000001364004d00000000000000000000000000403000 -180000001364004d00000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-120.phpt b/tests/bson-corpus/decimal128-2-valid-120.phpt index 9f94a9444..03bbeeaa9 100644 --- a/tests/bson-corpus/decimal128-2-valid-120.phpt +++ b/tests/bson-corpus/decimal128-2-valid-120.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364004E00000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "78"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364004e00000000000000000000000000403000 -180000001364004e00000000000000000000000000403000 -{"d":{"$numberDecimal":"78"}} {"d":{"$numberDecimal":"78"}} 180000001364004e00000000000000000000000000403000 -180000001364004e00000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-121.phpt b/tests/bson-corpus/decimal128-2-valid-121.phpt index 727990ab2..96264f2d1 100644 --- a/tests/bson-corpus/decimal128-2-valid-121.phpt +++ b/tests/bson-corpus/decimal128-2-valid-121.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364004F00000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "79"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364004f00000000000000000000000000403000 -180000001364004f00000000000000000000000000403000 -{"d":{"$numberDecimal":"79"}} {"d":{"$numberDecimal":"79"}} 180000001364004f00000000000000000000000000403000 -180000001364004f00000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-122.phpt b/tests/bson-corpus/decimal128-2-valid-122.phpt index 48ac07eb8..afc4e6338 100644 --- a/tests/bson-corpus/decimal128-2-valid-122.phpt +++ b/tests/bson-corpus/decimal128-2-valid-122.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364007B00000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "123"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364007b00000000000000000000000000403000 -180000001364007b00000000000000000000000000403000 -{"d":{"$numberDecimal":"123"}} {"d":{"$numberDecimal":"123"}} 180000001364007b00000000000000000000000000403000 -180000001364007b00000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-123.phpt b/tests/bson-corpus/decimal128-2-valid-123.phpt index f0f54122a..f60430887 100644 --- a/tests/bson-corpus/decimal128-2-valid-123.phpt +++ b/tests/bson-corpus/decimal128-2-valid-123.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1800000013640039300000000000000000000000003C3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "123.45"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1800000013640039300000000000000000000000003c3000 -1800000013640039300000000000000000000000003c3000 -{"d":{"$numberDecimal":"123.45"}} {"d":{"$numberDecimal":"123.45"}} 1800000013640039300000000000000000000000003c3000 -1800000013640039300000000000000000000000003c3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-124.phpt b/tests/bson-corpus/decimal128-2-valid-124.phpt index 40d958e18..75ff9d1a3 100644 --- a/tests/bson-corpus/decimal128-2-valid-124.phpt +++ b/tests/bson-corpus/decimal128-2-valid-124.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000802000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "520"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000802000000000000000000000000403000 -180000001364000802000000000000000000000000403000 -{"d":{"$numberDecimal":"520"}} {"d":{"$numberDecimal":"520"}} 180000001364000802000000000000000000000000403000 -180000001364000802000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-125.phpt b/tests/bson-corpus/decimal128-2-valid-125.phpt index 25e9e7d39..d14b96b8f 100644 --- a/tests/bson-corpus/decimal128-2-valid-125.phpt +++ b/tests/bson-corpus/decimal128-2-valid-125.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000902000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "521"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000902000000000000000000000000403000 -180000001364000902000000000000000000000000403000 -{"d":{"$numberDecimal":"521"}} {"d":{"$numberDecimal":"521"}} 180000001364000902000000000000000000000000403000 -180000001364000902000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-126.phpt b/tests/bson-corpus/decimal128-2-valid-126.phpt index dd02cfceb..e69c9f67e 100644 --- a/tests/bson-corpus/decimal128-2-valid-126.phpt +++ b/tests/bson-corpus/decimal128-2-valid-126.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000903000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "777"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000903000000000000000000000000403000 -180000001364000903000000000000000000000000403000 -{"d":{"$numberDecimal":"777"}} {"d":{"$numberDecimal":"777"}} 180000001364000903000000000000000000000000403000 -180000001364000903000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-127.phpt b/tests/bson-corpus/decimal128-2-valid-127.phpt index c5f4ea0af..f6f24c2ef 100644 --- a/tests/bson-corpus/decimal128-2-valid-127.phpt +++ b/tests/bson-corpus/decimal128-2-valid-127.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000A03000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "778"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000a03000000000000000000000000403000 -180000001364000a03000000000000000000000000403000 -{"d":{"$numberDecimal":"778"}} {"d":{"$numberDecimal":"778"}} 180000001364000a03000000000000000000000000403000 -180000001364000a03000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-128.phpt b/tests/bson-corpus/decimal128-2-valid-128.phpt index 65c9c4e2d..881d0beec 100644 --- a/tests/bson-corpus/decimal128-2-valid-128.phpt +++ b/tests/bson-corpus/decimal128-2-valid-128.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364001303000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "787"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364001303000000000000000000000000403000 -180000001364001303000000000000000000000000403000 -{"d":{"$numberDecimal":"787"}} {"d":{"$numberDecimal":"787"}} 180000001364001303000000000000000000000000403000 -180000001364001303000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-129.phpt b/tests/bson-corpus/decimal128-2-valid-129.phpt index 17ae78efa..96e8199fd 100644 --- a/tests/bson-corpus/decimal128-2-valid-129.phpt +++ b/tests/bson-corpus/decimal128-2-valid-129.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364001F03000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "799"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364001f03000000000000000000000000403000 -180000001364001f03000000000000000000000000403000 -{"d":{"$numberDecimal":"799"}} {"d":{"$numberDecimal":"799"}} 180000001364001f03000000000000000000000000403000 -180000001364001f03000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-130.phpt b/tests/bson-corpus/decimal128-2-valid-130.phpt index e2b27a8a0..af3261d64 100644 --- a/tests/bson-corpus/decimal128-2-valid-130.phpt +++ b/tests/bson-corpus/decimal128-2-valid-130.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364006D03000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "877"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364006d03000000000000000000000000403000 -180000001364006d03000000000000000000000000403000 -{"d":{"$numberDecimal":"877"}} {"d":{"$numberDecimal":"877"}} 180000001364006d03000000000000000000000000403000 -180000001364006d03000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-131.phpt b/tests/bson-corpus/decimal128-2-valid-131.phpt index d4700ed41..73f3955f3 100644 --- a/tests/bson-corpus/decimal128-2-valid-131.phpt +++ b/tests/bson-corpus/decimal128-2-valid-131.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364007803000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "888"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364007803000000000000000000000000403000 -180000001364007803000000000000000000000000403000 -{"d":{"$numberDecimal":"888"}} {"d":{"$numberDecimal":"888"}} 180000001364007803000000000000000000000000403000 -180000001364007803000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-132.phpt b/tests/bson-corpus/decimal128-2-valid-132.phpt index d8971cb99..95b938208 100644 --- a/tests/bson-corpus/decimal128-2-valid-132.phpt +++ b/tests/bson-corpus/decimal128-2-valid-132.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364007903000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "889"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364007903000000000000000000000000403000 -180000001364007903000000000000000000000000403000 -{"d":{"$numberDecimal":"889"}} {"d":{"$numberDecimal":"889"}} 180000001364007903000000000000000000000000403000 -180000001364007903000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-133.phpt b/tests/bson-corpus/decimal128-2-valid-133.phpt index 533ce1291..509380ce0 100644 --- a/tests/bson-corpus/decimal128-2-valid-133.phpt +++ b/tests/bson-corpus/decimal128-2-valid-133.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364008203000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "898"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364008203000000000000000000000000403000 -180000001364008203000000000000000000000000403000 -{"d":{"$numberDecimal":"898"}} {"d":{"$numberDecimal":"898"}} 180000001364008203000000000000000000000000403000 -180000001364008203000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-134.phpt b/tests/bson-corpus/decimal128-2-valid-134.phpt index e8b1a62dd..889fbe397 100644 --- a/tests/bson-corpus/decimal128-2-valid-134.phpt +++ b/tests/bson-corpus/decimal128-2-valid-134.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364008303000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "899"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364008303000000000000000000000000403000 -180000001364008303000000000000000000000000403000 -{"d":{"$numberDecimal":"899"}} {"d":{"$numberDecimal":"899"}} 180000001364008303000000000000000000000000403000 -180000001364008303000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-135.phpt b/tests/bson-corpus/decimal128-2-valid-135.phpt index 94ceb9f7d..83a7f79b3 100644 --- a/tests/bson-corpus/decimal128-2-valid-135.phpt +++ b/tests/bson-corpus/decimal128-2-valid-135.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400D303000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "979"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400d303000000000000000000000000403000 -18000000136400d303000000000000000000000000403000 -{"d":{"$numberDecimal":"979"}} {"d":{"$numberDecimal":"979"}} 18000000136400d303000000000000000000000000403000 -18000000136400d303000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-136.phpt b/tests/bson-corpus/decimal128-2-valid-136.phpt index 6af236a93..3cd783f53 100644 --- a/tests/bson-corpus/decimal128-2-valid-136.phpt +++ b/tests/bson-corpus/decimal128-2-valid-136.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400DC03000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "988"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400dc03000000000000000000000000403000 -18000000136400dc03000000000000000000000000403000 -{"d":{"$numberDecimal":"988"}} {"d":{"$numberDecimal":"988"}} 18000000136400dc03000000000000000000000000403000 -18000000136400dc03000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-137.phpt b/tests/bson-corpus/decimal128-2-valid-137.phpt index 430703d5e..ee4e22543 100644 --- a/tests/bson-corpus/decimal128-2-valid-137.phpt +++ b/tests/bson-corpus/decimal128-2-valid-137.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400DD03000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "989"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400dd03000000000000000000000000403000 -18000000136400dd03000000000000000000000000403000 -{"d":{"$numberDecimal":"989"}} {"d":{"$numberDecimal":"989"}} 18000000136400dd03000000000000000000000000403000 -18000000136400dd03000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-138.phpt b/tests/bson-corpus/decimal128-2-valid-138.phpt index b428b210e..d6e1151c5 100644 --- a/tests/bson-corpus/decimal128-2-valid-138.phpt +++ b/tests/bson-corpus/decimal128-2-valid-138.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400E203000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "994"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400e203000000000000000000000000403000 -18000000136400e203000000000000000000000000403000 -{"d":{"$numberDecimal":"994"}} {"d":{"$numberDecimal":"994"}} 18000000136400e203000000000000000000000000403000 -18000000136400e203000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-139.phpt b/tests/bson-corpus/decimal128-2-valid-139.phpt index 18754f3a3..6da15ce19 100644 --- a/tests/bson-corpus/decimal128-2-valid-139.phpt +++ b/tests/bson-corpus/decimal128-2-valid-139.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400E303000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "995"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400e303000000000000000000000000403000 -18000000136400e303000000000000000000000000403000 -{"d":{"$numberDecimal":"995"}} {"d":{"$numberDecimal":"995"}} 18000000136400e303000000000000000000000000403000 -18000000136400e303000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-140.phpt b/tests/bson-corpus/decimal128-2-valid-140.phpt index 2d7c888d1..e9cc08d87 100644 --- a/tests/bson-corpus/decimal128-2-valid-140.phpt +++ b/tests/bson-corpus/decimal128-2-valid-140.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400E503000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "997"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400e503000000000000000000000000403000 -18000000136400e503000000000000000000000000403000 -{"d":{"$numberDecimal":"997"}} {"d":{"$numberDecimal":"997"}} 18000000136400e503000000000000000000000000403000 -18000000136400e503000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-141.phpt b/tests/bson-corpus/decimal128-2-valid-141.phpt index 081e7b826..311c91997 100644 --- a/tests/bson-corpus/decimal128-2-valid-141.phpt +++ b/tests/bson-corpus/decimal128-2-valid-141.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400E603000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "998"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400e603000000000000000000000000403000 -18000000136400e603000000000000000000000000403000 -{"d":{"$numberDecimal":"998"}} {"d":{"$numberDecimal":"998"}} 18000000136400e603000000000000000000000000403000 -18000000136400e603000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-142.phpt b/tests/bson-corpus/decimal128-2-valid-142.phpt index a887f11dc..d91ee4825 100644 --- a/tests/bson-corpus/decimal128-2-valid-142.phpt +++ b/tests/bson-corpus/decimal128-2-valid-142.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400E703000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "999"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400e703000000000000000000000000403000 -18000000136400e703000000000000000000000000403000 -{"d":{"$numberDecimal":"999"}} {"d":{"$numberDecimal":"999"}} 18000000136400e703000000000000000000000000403000 -18000000136400e703000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-143.phpt b/tests/bson-corpus/decimal128-2-valid-143.phpt index 841dda5b8..258bf54e5 100644 --- a/tests/bson-corpus/decimal128-2-valid-143.phpt +++ b/tests/bson-corpus/decimal128-2-valid-143.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400D204000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1234"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400d204000000000000000000000000403000 -18000000136400d204000000000000000000000000403000 -{"d":{"$numberDecimal":"1234"}} {"d":{"$numberDecimal":"1234"}} 18000000136400d204000000000000000000000000403000 -18000000136400d204000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-144.phpt b/tests/bson-corpus/decimal128-2-valid-144.phpt index 246fff292..b8a435d6d 100644 --- a/tests/bson-corpus/decimal128-2-valid-144.phpt +++ b/tests/bson-corpus/decimal128-2-valid-144.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364003930000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "12345"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364003930000000000000000000000000403000 -180000001364003930000000000000000000000000403000 -{"d":{"$numberDecimal":"12345"}} {"d":{"$numberDecimal":"12345"}} 180000001364003930000000000000000000000000403000 -180000001364003930000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-145.phpt b/tests/bson-corpus/decimal128-2-valid-145.phpt index 8837367ce..a709328c2 100644 --- a/tests/bson-corpus/decimal128-2-valid-145.phpt +++ b/tests/bson-corpus/decimal128-2-valid-145.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364003075000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "30000"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364003075000000000000000000000000403000 -180000001364003075000000000000000000000000403000 -{"d":{"$numberDecimal":"30000"}} {"d":{"$numberDecimal":"30000"}} 180000001364003075000000000000000000000000403000 -180000001364003075000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-146.phpt b/tests/bson-corpus/decimal128-2-valid-146.phpt index cecc4884a..7b1b23e62 100644 --- a/tests/bson-corpus/decimal128-2-valid-146.phpt +++ b/tests/bson-corpus/decimal128-2-valid-146.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1800000013640090940D0000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "890000"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1800000013640090940d0000000000000000000000403000 -1800000013640090940d0000000000000000000000403000 -{"d":{"$numberDecimal":"890000"}} {"d":{"$numberDecimal":"890000"}} 1800000013640090940d0000000000000000000000403000 -1800000013640090940d0000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-147.phpt b/tests/bson-corpus/decimal128-2-valid-147.phpt index 9ca3d9284..872a92d7a 100644 --- a/tests/bson-corpus/decimal128-2-valid-147.phpt +++ b/tests/bson-corpus/decimal128-2-valid-147.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400FEFFFF7F00000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "2147483646"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400feffff7f00000000000000000000403000 -18000000136400feffff7f00000000000000000000403000 -{"d":{"$numberDecimal":"2147483646"}} {"d":{"$numberDecimal":"2147483646"}} 18000000136400feffff7f00000000000000000000403000 -18000000136400feffff7f00000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-148.phpt b/tests/bson-corpus/decimal128-2-valid-148.phpt index 3194e68fd..b0e3e9a7c 100644 --- a/tests/bson-corpus/decimal128-2-valid-148.phpt +++ b/tests/bson-corpus/decimal128-2-valid-148.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400FFFFFF7F00000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "2147483647"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400ffffff7f00000000000000000000403000 -18000000136400ffffff7f00000000000000000000403000 -{"d":{"$numberDecimal":"2147483647"}} {"d":{"$numberDecimal":"2147483647"}} 18000000136400ffffff7f00000000000000000000403000 -18000000136400ffffff7f00000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-149.phpt b/tests/bson-corpus/decimal128-2-valid-149.phpt index 6daea5399..7781dec07 100644 --- a/tests/bson-corpus/decimal128-2-valid-149.phpt +++ b/tests/bson-corpus/decimal128-2-valid-149.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000000008000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "2147483648"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000000008000000000000000000000403000 -180000001364000000008000000000000000000000403000 -{"d":{"$numberDecimal":"2147483648"}} {"d":{"$numberDecimal":"2147483648"}} 180000001364000000008000000000000000000000403000 -180000001364000000008000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-150.phpt b/tests/bson-corpus/decimal128-2-valid-150.phpt index 1bd0955f6..29c8525b5 100644 --- a/tests/bson-corpus/decimal128-2-valid-150.phpt +++ b/tests/bson-corpus/decimal128-2-valid-150.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000100008000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "2147483649"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000100008000000000000000000000403000 -180000001364000100008000000000000000000000403000 -{"d":{"$numberDecimal":"2147483649"}} {"d":{"$numberDecimal":"2147483649"}} 180000001364000100008000000000000000000000403000 -180000001364000100008000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-151.phpt b/tests/bson-corpus/decimal128-2-valid-151.phpt index 5a34ba37c..255d9e0ef 100644 --- a/tests/bson-corpus/decimal128-2-valid-151.phpt +++ b/tests/bson-corpus/decimal128-2-valid-151.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400FEFFFFFF00000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "4294967294"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400feffffff00000000000000000000403000 -18000000136400feffffff00000000000000000000403000 -{"d":{"$numberDecimal":"4294967294"}} {"d":{"$numberDecimal":"4294967294"}} 18000000136400feffffff00000000000000000000403000 -18000000136400feffffff00000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-152.phpt b/tests/bson-corpus/decimal128-2-valid-152.phpt index 631f87110..1af57831b 100644 --- a/tests/bson-corpus/decimal128-2-valid-152.phpt +++ b/tests/bson-corpus/decimal128-2-valid-152.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400FFFFFFFF00000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "4294967295"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400ffffffff00000000000000000000403000 -18000000136400ffffffff00000000000000000000403000 -{"d":{"$numberDecimal":"4294967295"}} {"d":{"$numberDecimal":"4294967295"}} 18000000136400ffffffff00000000000000000000403000 -18000000136400ffffffff00000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-153.phpt b/tests/bson-corpus/decimal128-2-valid-153.phpt index 68c1ac23a..145a7caa5 100644 --- a/tests/bson-corpus/decimal128-2-valid-153.phpt +++ b/tests/bson-corpus/decimal128-2-valid-153.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000000000001000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "4294967296"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000000000001000000000000000000403000 -180000001364000000000001000000000000000000403000 -{"d":{"$numberDecimal":"4294967296"}} {"d":{"$numberDecimal":"4294967296"}} 180000001364000000000001000000000000000000403000 -180000001364000000000001000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-154.phpt b/tests/bson-corpus/decimal128-2-valid-154.phpt index 6c9e22d3b..252e645f5 100644 --- a/tests/bson-corpus/decimal128-2-valid-154.phpt +++ b/tests/bson-corpus/decimal128-2-valid-154.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000100000001000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "4294967297"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000100000001000000000000000000403000 -180000001364000100000001000000000000000000403000 -{"d":{"$numberDecimal":"4294967297"}} {"d":{"$numberDecimal":"4294967297"}} 180000001364000100000001000000000000000000403000 -180000001364000100000001000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-155.phpt b/tests/bson-corpus/decimal128-2-valid-155.phpt index 812cbfc8b..24ca2d4ab 100644 --- a/tests/bson-corpus/decimal128-2-valid-155.phpt +++ b/tests/bson-corpus/decimal128-2-valid-155.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400C7711CC7B548F377DC80A131C836403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1111111111111111111111111111111111"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400c7711cc7b548f377dc80a131c836403000 -18000000136400c7711cc7b548f377dc80a131c836403000 -{"d":{"$numberDecimal":"1111111111111111111111111111111111"}} {"d":{"$numberDecimal":"1111111111111111111111111111111111"}} 18000000136400c7711cc7b548f377dc80a131c836403000 -18000000136400c7711cc7b548f377dc80a131c836403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-156.phpt b/tests/bson-corpus/decimal128-2-valid-156.phpt index 4ff5a356b..9720fe201 100644 --- a/tests/bson-corpus/decimal128-2-valid-156.phpt +++ b/tests/bson-corpus/decimal128-2-valid-156.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400F2AF967ED05C82DE3297FF6FDE3C403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1234567890123456789012345678901234"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400f2af967ed05c82de3297ff6fde3c403000 -18000000136400f2af967ed05c82de3297ff6fde3c403000 -{"d":{"$numberDecimal":"1234567890123456789012345678901234"}} {"d":{"$numberDecimal":"1234567890123456789012345678901234"}} 18000000136400f2af967ed05c82de3297ff6fde3c403000 -18000000136400f2af967ed05c82de3297ff6fde3c403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-2-valid-157.phpt b/tests/bson-corpus/decimal128-2-valid-157.phpt index 39104ebe0..db95b1de4 100644 --- a/tests/bson-corpus/decimal128-2-valid-157.phpt +++ b/tests/bson-corpus/decimal128-2-valid-157.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400FFFFFFFF638E8D37C087ADBE09ED413000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "9999999999999999999999999999999999"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400ffffffff638e8d37c087adbe09ed413000 -18000000136400ffffffff638e8d37c087adbe09ed413000 -{"d":{"$numberDecimal":"9999999999999999999999999999999999"}} {"d":{"$numberDecimal":"9999999999999999999999999999999999"}} 18000000136400ffffffff638e8d37c087adbe09ed413000 -18000000136400ffffffff638e8d37c087adbe09ed413000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-001.phpt b/tests/bson-corpus/decimal128-3-valid-001.phpt index 189133f1d..1435c4242 100644 --- a/tests/bson-corpus/decimal128-3-valid-001.phpt +++ b/tests/bson-corpus/decimal128-3-valid-001.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400185C0ACE0000000000000000000038B000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-345678.5432"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "-00345678.5432"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400185c0ace0000000000000000000038b000 -18000000136400185c0ace0000000000000000000038b000 -{"d":{"$numberDecimal":"-345678.5432"}} {"d":{"$numberDecimal":"-345678.5432"}} 18000000136400185c0ace0000000000000000000038b000 18000000136400185c0ace0000000000000000000038b000 -18000000136400185c0ace0000000000000000000038b000 -18000000136400185c0ace0000000000000000000038b000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-002.phpt b/tests/bson-corpus/decimal128-3-valid-002.phpt index 795628425..d7bffd800 100644 --- a/tests/bson-corpus/decimal128-3-valid-002.phpt +++ b/tests/bson-corpus/decimal128-3-valid-002.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400185C0ACE0000000000000000000038B000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-345678.5432"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "-0345678.5432"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400185c0ace0000000000000000000038b000 -18000000136400185c0ace0000000000000000000038b000 -{"d":{"$numberDecimal":"-345678.5432"}} {"d":{"$numberDecimal":"-345678.5432"}} 18000000136400185c0ace0000000000000000000038b000 18000000136400185c0ace0000000000000000000038b000 -18000000136400185c0ace0000000000000000000038b000 -18000000136400185c0ace0000000000000000000038b000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-003.phpt b/tests/bson-corpus/decimal128-3-valid-003.phpt index aab503926..5be6671cc 100644 --- a/tests/bson-corpus/decimal128-3-valid-003.phpt +++ b/tests/bson-corpus/decimal128-3-valid-003.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400185C0ACE0000000000000000000038B000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-345678.5432"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400185c0ace0000000000000000000038b000 -18000000136400185c0ace0000000000000000000038b000 -{"d":{"$numberDecimal":"-345678.5432"}} {"d":{"$numberDecimal":"-345678.5432"}} 18000000136400185c0ace0000000000000000000038b000 -18000000136400185c0ace0000000000000000000038b000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-004.phpt b/tests/bson-corpus/decimal128-3-valid-004.phpt index f9255db4b..d3d47bfdb 100644 --- a/tests/bson-corpus/decimal128-3-valid-004.phpt +++ b/tests/bson-corpus/decimal128-3-valid-004.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364004C0000000000000000000000000040B000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-76"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364004c0000000000000000000000000040b000 -180000001364004c0000000000000000000000000040b000 -{"d":{"$numberDecimal":"-76"}} {"d":{"$numberDecimal":"-76"}} 180000001364004c0000000000000000000000000040b000 -180000001364004c0000000000000000000000000040b000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-005.phpt b/tests/bson-corpus/decimal128-3-valid-005.phpt index 4a6d415e9..2b9d2be98 100644 --- a/tests/bson-corpus/decimal128-3-valid-005.phpt +++ b/tests/bson-corpus/decimal128-3-valid-005.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000F270000000000000000000000003AB000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-9.999"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000f270000000000000000000000003ab000 -180000001364000f270000000000000000000000003ab000 -{"d":{"$numberDecimal":"-9.999"}} {"d":{"$numberDecimal":"-9.999"}} 180000001364000f270000000000000000000000003ab000 -180000001364000f270000000000000000000000003ab000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-006.phpt b/tests/bson-corpus/decimal128-3-valid-006.phpt index 0038a918b..b9dd946e5 100644 --- a/tests/bson-corpus/decimal128-3-valid-006.phpt +++ b/tests/bson-corpus/decimal128-3-valid-006.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364009F230000000000000000000000003AB000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-9.119"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364009f230000000000000000000000003ab000 -180000001364009f230000000000000000000000003ab000 -{"d":{"$numberDecimal":"-9.119"}} {"d":{"$numberDecimal":"-9.119"}} 180000001364009f230000000000000000000000003ab000 -180000001364009f230000000000000000000000003ab000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-007.phpt b/tests/bson-corpus/decimal128-3-valid-007.phpt index badba1d0a..8907083fa 100644 --- a/tests/bson-corpus/decimal128-3-valid-007.phpt +++ b/tests/bson-corpus/decimal128-3-valid-007.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364008F030000000000000000000000003CB000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-9.11"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364008f030000000000000000000000003cb000 -180000001364008f030000000000000000000000003cb000 -{"d":{"$numberDecimal":"-9.11"}} {"d":{"$numberDecimal":"-9.11"}} 180000001364008f030000000000000000000000003cb000 -180000001364008f030000000000000000000000003cb000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-008.phpt b/tests/bson-corpus/decimal128-3-valid-008.phpt index 313a44404..5c969e998 100644 --- a/tests/bson-corpus/decimal128-3-valid-008.phpt +++ b/tests/bson-corpus/decimal128-3-valid-008.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364005B000000000000000000000000003EB000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-9.1"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364005b000000000000000000000000003eb000 -180000001364005b000000000000000000000000003eb000 -{"d":{"$numberDecimal":"-9.1"}} {"d":{"$numberDecimal":"-9.1"}} 180000001364005b000000000000000000000000003eb000 -180000001364005b000000000000000000000000003eb000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-009.phpt b/tests/bson-corpus/decimal128-3-valid-009.phpt index 12a7e693b..1bbe30928 100644 --- a/tests/bson-corpus/decimal128-3-valid-009.phpt +++ b/tests/bson-corpus/decimal128-3-valid-009.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('1800000013640099761CC7B548F377DC80A131C836FEAF00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-1.111111111111111111111111111112345"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "-1.1111111111111111111111111111123450"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 1800000013640099761cc7b548f377dc80a131c836feaf00 -1800000013640099761cc7b548f377dc80a131c836feaf00 -{"d":{"$numberDecimal":"-1.111111111111111111111111111112345"}} {"d":{"$numberDecimal":"-1.111111111111111111111111111112345"}} 1800000013640099761cc7b548f377dc80a131c836feaf00 1800000013640099761cc7b548f377dc80a131c836feaf00 -1800000013640099761cc7b548f377dc80a131c836feaf00 -1800000013640099761cc7b548f377dc80a131c836feaf00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-010.phpt b/tests/bson-corpus/decimal128-3-valid-010.phpt index 4db0ae9be..4ff297a41 100644 --- a/tests/bson-corpus/decimal128-3-valid-010.phpt +++ b/tests/bson-corpus/decimal128-3-valid-010.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000A000000000000000000000000003EB000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-1.0"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000a000000000000000000000000003eb000 -180000001364000a000000000000000000000000003eb000 -{"d":{"$numberDecimal":"-1.0"}} {"d":{"$numberDecimal":"-1.0"}} 180000001364000a000000000000000000000000003eb000 -180000001364000a000000000000000000000000003eb000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-011.phpt b/tests/bson-corpus/decimal128-3-valid-011.phpt index ab8b99e63..d6dd8af98 100644 --- a/tests/bson-corpus/decimal128-3-valid-011.phpt +++ b/tests/bson-corpus/decimal128-3-valid-011.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400010000000000000000000000000040B000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-1"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400010000000000000000000000000040b000 -18000000136400010000000000000000000000000040b000 -{"d":{"$numberDecimal":"-1"}} {"d":{"$numberDecimal":"-1"}} 18000000136400010000000000000000000000000040b000 -18000000136400010000000000000000000000000040b000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-012.phpt b/tests/bson-corpus/decimal128-3-valid-012.phpt index cc302e0fa..aee836fff 100644 --- a/tests/bson-corpus/decimal128-3-valid-012.phpt +++ b/tests/bson-corpus/decimal128-3-valid-012.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('1800000013640000000000000000000000000000002E3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0E-9"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.000000000"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 1800000013640000000000000000000000000000002e3000 -1800000013640000000000000000000000000000002e3000 -{"d":{"$numberDecimal":"0E-9"}} {"d":{"$numberDecimal":"0E-9"}} 1800000013640000000000000000000000000000002e3000 1800000013640000000000000000000000000000002e3000 -1800000013640000000000000000000000000000002e3000 -1800000013640000000000000000000000000000002e3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-013.phpt b/tests/bson-corpus/decimal128-3-valid-013.phpt index c7133a416..8b90f1d84 100644 --- a/tests/bson-corpus/decimal128-3-valid-013.phpt +++ b/tests/bson-corpus/decimal128-3-valid-013.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('1800000013640000000000000000000000000000002EB000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-0E-9"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "-0.000000000"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 1800000013640000000000000000000000000000002eb000 -1800000013640000000000000000000000000000002eb000 -{"d":{"$numberDecimal":"-0E-9"}} {"d":{"$numberDecimal":"-0E-9"}} 1800000013640000000000000000000000000000002eb000 1800000013640000000000000000000000000000002eb000 -1800000013640000000000000000000000000000002eb000 -1800000013640000000000000000000000000000002eb000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-014.phpt b/tests/bson-corpus/decimal128-3-valid-014.phpt index c0ea4ee4d..c0e710296 100644 --- a/tests/bson-corpus/decimal128-3-valid-014.phpt +++ b/tests/bson-corpus/decimal128-3-valid-014.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000303000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0E-8"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.00000000"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000303000 -180000001364000000000000000000000000000000303000 -{"d":{"$numberDecimal":"0E-8"}} {"d":{"$numberDecimal":"0E-8"}} 180000001364000000000000000000000000000000303000 180000001364000000000000000000000000000000303000 -180000001364000000000000000000000000000000303000 -180000001364000000000000000000000000000000303000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-015.phpt b/tests/bson-corpus/decimal128-3-valid-015.phpt index 7f842de1c..55a93ea4f 100644 --- a/tests/bson-corpus/decimal128-3-valid-015.phpt +++ b/tests/bson-corpus/decimal128-3-valid-015.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400000000000000000000000000000030B000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-0E-8"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "-0.00000000"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400000000000000000000000000000030b000 -18000000136400000000000000000000000000000030b000 -{"d":{"$numberDecimal":"-0E-8"}} {"d":{"$numberDecimal":"-0E-8"}} 18000000136400000000000000000000000000000030b000 18000000136400000000000000000000000000000030b000 -18000000136400000000000000000000000000000030b000 -18000000136400000000000000000000000000000030b000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-016.phpt b/tests/bson-corpus/decimal128-3-valid-016.phpt index efd04a62e..3b726fa3c 100644 --- a/tests/bson-corpus/decimal128-3-valid-016.phpt +++ b/tests/bson-corpus/decimal128-3-valid-016.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000323000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0E-7"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.0000000"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000323000 -180000001364000000000000000000000000000000323000 -{"d":{"$numberDecimal":"0E-7"}} {"d":{"$numberDecimal":"0E-7"}} 180000001364000000000000000000000000000000323000 180000001364000000000000000000000000000000323000 -180000001364000000000000000000000000000000323000 -180000001364000000000000000000000000000000323000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-017.phpt b/tests/bson-corpus/decimal128-3-valid-017.phpt index 404ba43f6..9e101332c 100644 --- a/tests/bson-corpus/decimal128-3-valid-017.phpt +++ b/tests/bson-corpus/decimal128-3-valid-017.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400000000000000000000000000000032B000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-0E-7"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "-0.0000000"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400000000000000000000000000000032b000 -18000000136400000000000000000000000000000032b000 -{"d":{"$numberDecimal":"-0E-7"}} {"d":{"$numberDecimal":"-0E-7"}} 18000000136400000000000000000000000000000032b000 18000000136400000000000000000000000000000032b000 -18000000136400000000000000000000000000000032b000 -18000000136400000000000000000000000000000032b000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-018.phpt b/tests/bson-corpus/decimal128-3-valid-018.phpt index fe2d0f725..e4874e9be 100644 --- a/tests/bson-corpus/decimal128-3-valid-018.phpt +++ b/tests/bson-corpus/decimal128-3-valid-018.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000000000000000000000000000000343000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.000000"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000000000000000000000000000000343000 -180000001364000000000000000000000000000000343000 -{"d":{"$numberDecimal":"0.000000"}} {"d":{"$numberDecimal":"0.000000"}} 180000001364000000000000000000000000000000343000 -180000001364000000000000000000000000000000343000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-019.phpt b/tests/bson-corpus/decimal128-3-valid-019.phpt index e7619e0d9..f4e6efd04 100644 --- a/tests/bson-corpus/decimal128-3-valid-019.phpt +++ b/tests/bson-corpus/decimal128-3-valid-019.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400000000000000000000000000000034B000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-0.000000"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400000000000000000000000000000034b000 -18000000136400000000000000000000000000000034b000 -{"d":{"$numberDecimal":"-0.000000"}} {"d":{"$numberDecimal":"-0.000000"}} 18000000136400000000000000000000000000000034b000 -18000000136400000000000000000000000000000034b000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-020.phpt b/tests/bson-corpus/decimal128-3-valid-020.phpt index c21a29507..4832d53c6 100644 --- a/tests/bson-corpus/decimal128-3-valid-020.phpt +++ b/tests/bson-corpus/decimal128-3-valid-020.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000000000000000000000000000000363000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.00000"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000000000000000000000000000000363000 -180000001364000000000000000000000000000000363000 -{"d":{"$numberDecimal":"0.00000"}} {"d":{"$numberDecimal":"0.00000"}} 180000001364000000000000000000000000000000363000 -180000001364000000000000000000000000000000363000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-021.phpt b/tests/bson-corpus/decimal128-3-valid-021.phpt index 97f2e6058..219860139 100644 --- a/tests/bson-corpus/decimal128-3-valid-021.phpt +++ b/tests/bson-corpus/decimal128-3-valid-021.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400000000000000000000000000000036B000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-0.00000"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400000000000000000000000000000036b000 -18000000136400000000000000000000000000000036b000 -{"d":{"$numberDecimal":"-0.00000"}} {"d":{"$numberDecimal":"-0.00000"}} 18000000136400000000000000000000000000000036b000 -18000000136400000000000000000000000000000036b000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-022.phpt b/tests/bson-corpus/decimal128-3-valid-022.phpt index 387074c60..3aa9b99e2 100644 --- a/tests/bson-corpus/decimal128-3-valid-022.phpt +++ b/tests/bson-corpus/decimal128-3-valid-022.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "000000."}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000403000 -180000001364000000000000000000000000000000403000 -{"d":{"$numberDecimal":"0"}} {"d":{"$numberDecimal":"0"}} 180000001364000000000000000000000000000000403000 180000001364000000000000000000000000000000403000 -180000001364000000000000000000000000000000403000 -180000001364000000000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-023.phpt b/tests/bson-corpus/decimal128-3-valid-023.phpt index ac90f8ee6..f6432b8fa 100644 --- a/tests/bson-corpus/decimal128-3-valid-023.phpt +++ b/tests/bson-corpus/decimal128-3-valid-023.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000000000000000000000000000000383000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.0000"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000000000000000000000000000000383000 -180000001364000000000000000000000000000000383000 -{"d":{"$numberDecimal":"0.0000"}} {"d":{"$numberDecimal":"0.0000"}} 180000001364000000000000000000000000000000383000 -180000001364000000000000000000000000000000383000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-024.phpt b/tests/bson-corpus/decimal128-3-valid-024.phpt index 07a6bf21e..a5a8e0559 100644 --- a/tests/bson-corpus/decimal128-3-valid-024.phpt +++ b/tests/bson-corpus/decimal128-3-valid-024.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400000000000000000000000000000038B000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-0.0000"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400000000000000000000000000000038b000 -18000000136400000000000000000000000000000038b000 -{"d":{"$numberDecimal":"-0.0000"}} {"d":{"$numberDecimal":"-0.0000"}} 18000000136400000000000000000000000000000038b000 -18000000136400000000000000000000000000000038b000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-025.phpt b/tests/bson-corpus/decimal128-3-valid-025.phpt index 4f13e4d44..f76d480aa 100644 --- a/tests/bson-corpus/decimal128-3-valid-025.phpt +++ b/tests/bson-corpus/decimal128-3-valid-025.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "00000."}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000403000 -180000001364000000000000000000000000000000403000 -{"d":{"$numberDecimal":"0"}} {"d":{"$numberDecimal":"0"}} 180000001364000000000000000000000000000000403000 180000001364000000000000000000000000000000403000 -180000001364000000000000000000000000000000403000 -180000001364000000000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-026.phpt b/tests/bson-corpus/decimal128-3-valid-026.phpt index a89a52f45..eca5ebdaa 100644 --- a/tests/bson-corpus/decimal128-3-valid-026.phpt +++ b/tests/bson-corpus/decimal128-3-valid-026.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "+00000."}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000403000 -180000001364000000000000000000000000000000403000 -{"d":{"$numberDecimal":"0"}} {"d":{"$numberDecimal":"0"}} 180000001364000000000000000000000000000000403000 180000001364000000000000000000000000000000403000 -180000001364000000000000000000000000000000403000 -180000001364000000000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-027.phpt b/tests/bson-corpus/decimal128-3-valid-027.phpt index d114000dd..cf21f2f17 100644 --- a/tests/bson-corpus/decimal128-3-valid-027.phpt +++ b/tests/bson-corpus/decimal128-3-valid-027.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400000000000000000000000000000040B000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-0"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "-00000."}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400000000000000000000000000000040b000 -18000000136400000000000000000000000000000040b000 -{"d":{"$numberDecimal":"-0"}} {"d":{"$numberDecimal":"-0"}} 18000000136400000000000000000000000000000040b000 18000000136400000000000000000000000000000040b000 -18000000136400000000000000000000000000000040b000 -18000000136400000000000000000000000000000040b000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-028.phpt b/tests/bson-corpus/decimal128-3-valid-028.phpt index 6392aa5ea..0800d6a33 100644 --- a/tests/bson-corpus/decimal128-3-valid-028.phpt +++ b/tests/bson-corpus/decimal128-3-valid-028.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('1800000013640000000000000000000000000000003CB000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-0.00"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "-00.00"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 1800000013640000000000000000000000000000003cb000 -1800000013640000000000000000000000000000003cb000 -{"d":{"$numberDecimal":"-0.00"}} {"d":{"$numberDecimal":"-0.00"}} 1800000013640000000000000000000000000000003cb000 1800000013640000000000000000000000000000003cb000 -1800000013640000000000000000000000000000003cb000 -1800000013640000000000000000000000000000003cb000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-029.phpt b/tests/bson-corpus/decimal128-3-valid-029.phpt index 4cc086668..caede2f0d 100644 --- a/tests/bson-corpus/decimal128-3-valid-029.phpt +++ b/tests/bson-corpus/decimal128-3-valid-029.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1800000013640000000000000000000000000000003A3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.000"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1800000013640000000000000000000000000000003a3000 -1800000013640000000000000000000000000000003a3000 -{"d":{"$numberDecimal":"0.000"}} {"d":{"$numberDecimal":"0.000"}} 1800000013640000000000000000000000000000003a3000 -1800000013640000000000000000000000000000003a3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-030.phpt b/tests/bson-corpus/decimal128-3-valid-030.phpt index 9c3562f81..6205e66b0 100644 --- a/tests/bson-corpus/decimal128-3-valid-030.phpt +++ b/tests/bson-corpus/decimal128-3-valid-030.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1800000013640000000000000000000000000000003AB000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-0.000"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1800000013640000000000000000000000000000003ab000 -1800000013640000000000000000000000000000003ab000 -{"d":{"$numberDecimal":"-0.000"}} {"d":{"$numberDecimal":"-0.000"}} 1800000013640000000000000000000000000000003ab000 -1800000013640000000000000000000000000000003ab000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-031.phpt b/tests/bson-corpus/decimal128-3-valid-031.phpt index 0b1779a81..43b6f38a3 100644 --- a/tests/bson-corpus/decimal128-3-valid-031.phpt +++ b/tests/bson-corpus/decimal128-3-valid-031.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0000."}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000403000 -180000001364000000000000000000000000000000403000 -{"d":{"$numberDecimal":"0"}} {"d":{"$numberDecimal":"0"}} 180000001364000000000000000000000000000000403000 180000001364000000000000000000000000000000403000 -180000001364000000000000000000000000000000403000 -180000001364000000000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-032.phpt b/tests/bson-corpus/decimal128-3-valid-032.phpt index c1caa2d02..fac984646 100644 --- a/tests/bson-corpus/decimal128-3-valid-032.phpt +++ b/tests/bson-corpus/decimal128-3-valid-032.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('1800000013640000000000000000000000000000003A3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.000"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.000e+0"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 1800000013640000000000000000000000000000003a3000 -1800000013640000000000000000000000000000003a3000 -{"d":{"$numberDecimal":"0.000"}} {"d":{"$numberDecimal":"0.000"}} 1800000013640000000000000000000000000000003a3000 1800000013640000000000000000000000000000003a3000 -1800000013640000000000000000000000000000003a3000 -1800000013640000000000000000000000000000003a3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-033.phpt b/tests/bson-corpus/decimal128-3-valid-033.phpt index b6abdae3c..685d685fa 100644 --- a/tests/bson-corpus/decimal128-3-valid-033.phpt +++ b/tests/bson-corpus/decimal128-3-valid-033.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000383000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.0000"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.000E-1"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000383000 -180000001364000000000000000000000000000000383000 -{"d":{"$numberDecimal":"0.0000"}} {"d":{"$numberDecimal":"0.0000"}} 180000001364000000000000000000000000000000383000 180000001364000000000000000000000000000000383000 -180000001364000000000000000000000000000000383000 -180000001364000000000000000000000000000000383000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-034.phpt b/tests/bson-corpus/decimal128-3-valid-034.phpt index c6eee2fab..eb9dd2ac7 100644 --- a/tests/bson-corpus/decimal128-3-valid-034.phpt +++ b/tests/bson-corpus/decimal128-3-valid-034.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400000000000000000000000000000038B000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-0.0000"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "-0.000E-1"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400000000000000000000000000000038b000 -18000000136400000000000000000000000000000038b000 -{"d":{"$numberDecimal":"-0.0000"}} {"d":{"$numberDecimal":"-0.0000"}} 18000000136400000000000000000000000000000038b000 18000000136400000000000000000000000000000038b000 -18000000136400000000000000000000000000000038b000 -18000000136400000000000000000000000000000038b000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-035.phpt b/tests/bson-corpus/decimal128-3-valid-035.phpt index f60a68231..54af86174 100644 --- a/tests/bson-corpus/decimal128-3-valid-035.phpt +++ b/tests/bson-corpus/decimal128-3-valid-035.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000363000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.00000"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.000E-2"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000363000 -180000001364000000000000000000000000000000363000 -{"d":{"$numberDecimal":"0.00000"}} {"d":{"$numberDecimal":"0.00000"}} 180000001364000000000000000000000000000000363000 180000001364000000000000000000000000000000363000 -180000001364000000000000000000000000000000363000 -180000001364000000000000000000000000000000363000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-036.phpt b/tests/bson-corpus/decimal128-3-valid-036.phpt index c8ddb1100..2628f2ff3 100644 --- a/tests/bson-corpus/decimal128-3-valid-036.phpt +++ b/tests/bson-corpus/decimal128-3-valid-036.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400000000000000000000000000000036B000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-0.00000"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "-0.000E-2"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400000000000000000000000000000036b000 -18000000136400000000000000000000000000000036b000 -{"d":{"$numberDecimal":"-0.00000"}} {"d":{"$numberDecimal":"-0.00000"}} 18000000136400000000000000000000000000000036b000 18000000136400000000000000000000000000000036b000 -18000000136400000000000000000000000000000036b000 -18000000136400000000000000000000000000000036b000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-037.phpt b/tests/bson-corpus/decimal128-3-valid-037.phpt index cbf308da7..5b74fe4cb 100644 --- a/tests/bson-corpus/decimal128-3-valid-037.phpt +++ b/tests/bson-corpus/decimal128-3-valid-037.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000343000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.000000"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.000E-3"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000343000 -180000001364000000000000000000000000000000343000 -{"d":{"$numberDecimal":"0.000000"}} {"d":{"$numberDecimal":"0.000000"}} 180000001364000000000000000000000000000000343000 180000001364000000000000000000000000000000343000 -180000001364000000000000000000000000000000343000 -180000001364000000000000000000000000000000343000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-038.phpt b/tests/bson-corpus/decimal128-3-valid-038.phpt index 0a0656dec..3fdcd3692 100644 --- a/tests/bson-corpus/decimal128-3-valid-038.phpt +++ b/tests/bson-corpus/decimal128-3-valid-038.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400000000000000000000000000000034B000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-0.000000"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "-0.000E-3"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400000000000000000000000000000034b000 -18000000136400000000000000000000000000000034b000 -{"d":{"$numberDecimal":"-0.000000"}} {"d":{"$numberDecimal":"-0.000000"}} 18000000136400000000000000000000000000000034b000 18000000136400000000000000000000000000000034b000 -18000000136400000000000000000000000000000034b000 -18000000136400000000000000000000000000000034b000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-039.phpt b/tests/bson-corpus/decimal128-3-valid-039.phpt index bd6bc89ad..f8b59811b 100644 --- a/tests/bson-corpus/decimal128-3-valid-039.phpt +++ b/tests/bson-corpus/decimal128-3-valid-039.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000323000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0E-7"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.000E-4"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000323000 -180000001364000000000000000000000000000000323000 -{"d":{"$numberDecimal":"0E-7"}} {"d":{"$numberDecimal":"0E-7"}} 180000001364000000000000000000000000000000323000 180000001364000000000000000000000000000000323000 -180000001364000000000000000000000000000000323000 -180000001364000000000000000000000000000000323000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-040.phpt b/tests/bson-corpus/decimal128-3-valid-040.phpt index 7f6458862..77e8de75d 100644 --- a/tests/bson-corpus/decimal128-3-valid-040.phpt +++ b/tests/bson-corpus/decimal128-3-valid-040.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400000000000000000000000000000032B000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-0E-7"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "-0.000E-4"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400000000000000000000000000000032b000 -18000000136400000000000000000000000000000032b000 -{"d":{"$numberDecimal":"-0E-7"}} {"d":{"$numberDecimal":"-0E-7"}} 18000000136400000000000000000000000000000032b000 18000000136400000000000000000000000000000032b000 -18000000136400000000000000000000000000000032b000 -18000000136400000000000000000000000000000032b000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-041.phpt b/tests/bson-corpus/decimal128-3-valid-041.phpt index 60d3f929f..a80cc06b5 100644 --- a/tests/bson-corpus/decimal128-3-valid-041.phpt +++ b/tests/bson-corpus/decimal128-3-valid-041.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1800000013640000000000000000000000000000003C3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.00"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1800000013640000000000000000000000000000003c3000 -1800000013640000000000000000000000000000003c3000 -{"d":{"$numberDecimal":"0.00"}} {"d":{"$numberDecimal":"0.00"}} 1800000013640000000000000000000000000000003c3000 -1800000013640000000000000000000000000000003c3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-042.phpt b/tests/bson-corpus/decimal128-3-valid-042.phpt index 01e5e0a9c..d31793dfb 100644 --- a/tests/bson-corpus/decimal128-3-valid-042.phpt +++ b/tests/bson-corpus/decimal128-3-valid-042.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1800000013640000000000000000000000000000003CB000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-0.00"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1800000013640000000000000000000000000000003cb000 -1800000013640000000000000000000000000000003cb000 -{"d":{"$numberDecimal":"-0.00"}} {"d":{"$numberDecimal":"-0.00"}} 1800000013640000000000000000000000000000003cb000 -1800000013640000000000000000000000000000003cb000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-043.phpt b/tests/bson-corpus/decimal128-3-valid-043.phpt index 14b03d5f6..192759b5f 100644 --- a/tests/bson-corpus/decimal128-3-valid-043.phpt +++ b/tests/bson-corpus/decimal128-3-valid-043.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "000."}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000403000 -180000001364000000000000000000000000000000403000 -{"d":{"$numberDecimal":"0"}} {"d":{"$numberDecimal":"0"}} 180000001364000000000000000000000000000000403000 180000001364000000000000000000000000000000403000 -180000001364000000000000000000000000000000403000 -180000001364000000000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-044.phpt b/tests/bson-corpus/decimal128-3-valid-044.phpt index 1811336b5..c83759da7 100644 --- a/tests/bson-corpus/decimal128-3-valid-044.phpt +++ b/tests/bson-corpus/decimal128-3-valid-044.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('1800000013640000000000000000000000000000003C3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.00"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.00E+0"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 1800000013640000000000000000000000000000003c3000 -1800000013640000000000000000000000000000003c3000 -{"d":{"$numberDecimal":"0.00"}} {"d":{"$numberDecimal":"0.00"}} 1800000013640000000000000000000000000000003c3000 1800000013640000000000000000000000000000003c3000 -1800000013640000000000000000000000000000003c3000 -1800000013640000000000000000000000000000003c3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-045.phpt b/tests/bson-corpus/decimal128-3-valid-045.phpt index 8d08b33d7..6fca16123 100644 --- a/tests/bson-corpus/decimal128-3-valid-045.phpt +++ b/tests/bson-corpus/decimal128-3-valid-045.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('1800000013640000000000000000000000000000003C3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.00"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.00E-0"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 1800000013640000000000000000000000000000003c3000 -1800000013640000000000000000000000000000003c3000 -{"d":{"$numberDecimal":"0.00"}} {"d":{"$numberDecimal":"0.00"}} 1800000013640000000000000000000000000000003c3000 1800000013640000000000000000000000000000003c3000 -1800000013640000000000000000000000000000003c3000 -1800000013640000000000000000000000000000003c3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-046.phpt b/tests/bson-corpus/decimal128-3-valid-046.phpt index 1e003a920..4bec06e27 100644 --- a/tests/bson-corpus/decimal128-3-valid-046.phpt +++ b/tests/bson-corpus/decimal128-3-valid-046.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('1800000013640000000000000000000000000000003E3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.0"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.00E+1"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 1800000013640000000000000000000000000000003e3000 -1800000013640000000000000000000000000000003e3000 -{"d":{"$numberDecimal":"0.0"}} {"d":{"$numberDecimal":"0.0"}} 1800000013640000000000000000000000000000003e3000 1800000013640000000000000000000000000000003e3000 -1800000013640000000000000000000000000000003e3000 -1800000013640000000000000000000000000000003e3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-047.phpt b/tests/bson-corpus/decimal128-3-valid-047.phpt index 192801354..e37908bcd 100644 --- a/tests/bson-corpus/decimal128-3-valid-047.phpt +++ b/tests/bson-corpus/decimal128-3-valid-047.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('1800000013640000000000000000000000000000003A3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.000"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.00E-1"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 1800000013640000000000000000000000000000003a3000 -1800000013640000000000000000000000000000003a3000 -{"d":{"$numberDecimal":"0.000"}} {"d":{"$numberDecimal":"0.000"}} 1800000013640000000000000000000000000000003a3000 1800000013640000000000000000000000000000003a3000 -1800000013640000000000000000000000000000003a3000 -1800000013640000000000000000000000000000003a3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-048.phpt b/tests/bson-corpus/decimal128-3-valid-048.phpt index 62db42e8c..712e77562 100644 --- a/tests/bson-corpus/decimal128-3-valid-048.phpt +++ b/tests/bson-corpus/decimal128-3-valid-048.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000383000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.0000"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.00E-2"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000383000 -180000001364000000000000000000000000000000383000 -{"d":{"$numberDecimal":"0.0000"}} {"d":{"$numberDecimal":"0.0000"}} 180000001364000000000000000000000000000000383000 180000001364000000000000000000000000000000383000 -180000001364000000000000000000000000000000383000 -180000001364000000000000000000000000000000383000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-049.phpt b/tests/bson-corpus/decimal128-3-valid-049.phpt index 4bf628ba6..d94473ee6 100644 --- a/tests/bson-corpus/decimal128-3-valid-049.phpt +++ b/tests/bson-corpus/decimal128-3-valid-049.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400000000000000000000000000000038B000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-0.0000"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "-0.00E-2"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400000000000000000000000000000038b000 -18000000136400000000000000000000000000000038b000 -{"d":{"$numberDecimal":"-0.0000"}} {"d":{"$numberDecimal":"-0.0000"}} 18000000136400000000000000000000000000000038b000 18000000136400000000000000000000000000000038b000 -18000000136400000000000000000000000000000038b000 -18000000136400000000000000000000000000000038b000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-050.phpt b/tests/bson-corpus/decimal128-3-valid-050.phpt index 9fc23dca4..14552df5d 100644 --- a/tests/bson-corpus/decimal128-3-valid-050.phpt +++ b/tests/bson-corpus/decimal128-3-valid-050.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.00E+2"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000403000 -180000001364000000000000000000000000000000403000 -{"d":{"$numberDecimal":"0"}} {"d":{"$numberDecimal":"0"}} 180000001364000000000000000000000000000000403000 180000001364000000000000000000000000000000403000 -180000001364000000000000000000000000000000403000 -180000001364000000000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-051.phpt b/tests/bson-corpus/decimal128-3-valid-051.phpt index 20c4930dc..645a64303 100644 --- a/tests/bson-corpus/decimal128-3-valid-051.phpt +++ b/tests/bson-corpus/decimal128-3-valid-051.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000383000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.0000"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.00E-2"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000383000 -180000001364000000000000000000000000000000383000 -{"d":{"$numberDecimal":"0.0000"}} {"d":{"$numberDecimal":"0.0000"}} 180000001364000000000000000000000000000000383000 180000001364000000000000000000000000000000383000 -180000001364000000000000000000000000000000383000 -180000001364000000000000000000000000000000383000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-052.phpt b/tests/bson-corpus/decimal128-3-valid-052.phpt index cff762144..5b8f46d99 100644 --- a/tests/bson-corpus/decimal128-3-valid-052.phpt +++ b/tests/bson-corpus/decimal128-3-valid-052.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000363000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.00000"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.00E-3"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000363000 -180000001364000000000000000000000000000000363000 -{"d":{"$numberDecimal":"0.00000"}} {"d":{"$numberDecimal":"0.00000"}} 180000001364000000000000000000000000000000363000 180000001364000000000000000000000000000000363000 -180000001364000000000000000000000000000000363000 -180000001364000000000000000000000000000000363000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-053.phpt b/tests/bson-corpus/decimal128-3-valid-053.phpt index 08be83cb4..54c2ca236 100644 --- a/tests/bson-corpus/decimal128-3-valid-053.phpt +++ b/tests/bson-corpus/decimal128-3-valid-053.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400000000000000000000000000000036B000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-0.00000"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "-0.00E-3"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400000000000000000000000000000036b000 -18000000136400000000000000000000000000000036b000 -{"d":{"$numberDecimal":"-0.00000"}} {"d":{"$numberDecimal":"-0.00000"}} 18000000136400000000000000000000000000000036b000 18000000136400000000000000000000000000000036b000 -18000000136400000000000000000000000000000036b000 -18000000136400000000000000000000000000000036b000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-054.phpt b/tests/bson-corpus/decimal128-3-valid-054.phpt index 7fc45fe81..b3b9c6cc0 100644 --- a/tests/bson-corpus/decimal128-3-valid-054.phpt +++ b/tests/bson-corpus/decimal128-3-valid-054.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000423000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0E+1"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.00E+3"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000423000 -180000001364000000000000000000000000000000423000 -{"d":{"$numberDecimal":"0E+1"}} {"d":{"$numberDecimal":"0E+1"}} 180000001364000000000000000000000000000000423000 180000001364000000000000000000000000000000423000 -180000001364000000000000000000000000000000423000 -180000001364000000000000000000000000000000423000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-055.phpt b/tests/bson-corpus/decimal128-3-valid-055.phpt index aff1569e1..150a34805 100644 --- a/tests/bson-corpus/decimal128-3-valid-055.phpt +++ b/tests/bson-corpus/decimal128-3-valid-055.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000363000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.00000"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.00E-3"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000363000 -180000001364000000000000000000000000000000363000 -{"d":{"$numberDecimal":"0.00000"}} {"d":{"$numberDecimal":"0.00000"}} 180000001364000000000000000000000000000000363000 180000001364000000000000000000000000000000363000 -180000001364000000000000000000000000000000363000 -180000001364000000000000000000000000000000363000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-056.phpt b/tests/bson-corpus/decimal128-3-valid-056.phpt index 7ac5f3318..dad50b032 100644 --- a/tests/bson-corpus/decimal128-3-valid-056.phpt +++ b/tests/bson-corpus/decimal128-3-valid-056.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000343000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.000000"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.00E-4"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000343000 -180000001364000000000000000000000000000000343000 -{"d":{"$numberDecimal":"0.000000"}} {"d":{"$numberDecimal":"0.000000"}} 180000001364000000000000000000000000000000343000 180000001364000000000000000000000000000000343000 -180000001364000000000000000000000000000000343000 -180000001364000000000000000000000000000000343000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-057.phpt b/tests/bson-corpus/decimal128-3-valid-057.phpt index cbb983eac..cf0e059f4 100644 --- a/tests/bson-corpus/decimal128-3-valid-057.phpt +++ b/tests/bson-corpus/decimal128-3-valid-057.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000343000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.000000"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.00E-4"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000343000 -180000001364000000000000000000000000000000343000 -{"d":{"$numberDecimal":"0.000000"}} {"d":{"$numberDecimal":"0.000000"}} 180000001364000000000000000000000000000000343000 180000001364000000000000000000000000000000343000 -180000001364000000000000000000000000000000343000 -180000001364000000000000000000000000000000343000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-058.phpt b/tests/bson-corpus/decimal128-3-valid-058.phpt index adf71f91f..b7a849ec4 100644 --- a/tests/bson-corpus/decimal128-3-valid-058.phpt +++ b/tests/bson-corpus/decimal128-3-valid-058.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000443000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0E+2"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.00E+4"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000443000 -180000001364000000000000000000000000000000443000 -{"d":{"$numberDecimal":"0E+2"}} {"d":{"$numberDecimal":"0E+2"}} 180000001364000000000000000000000000000000443000 180000001364000000000000000000000000000000443000 -180000001364000000000000000000000000000000443000 -180000001364000000000000000000000000000000443000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-059.phpt b/tests/bson-corpus/decimal128-3-valid-059.phpt index 1a0c0a4ff..6661d0e39 100644 --- a/tests/bson-corpus/decimal128-3-valid-059.phpt +++ b/tests/bson-corpus/decimal128-3-valid-059.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000323000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0E-7"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.00E-5"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000323000 -180000001364000000000000000000000000000000323000 -{"d":{"$numberDecimal":"0E-7"}} {"d":{"$numberDecimal":"0E-7"}} 180000001364000000000000000000000000000000323000 180000001364000000000000000000000000000000323000 -180000001364000000000000000000000000000000323000 -180000001364000000000000000000000000000000323000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-060.phpt b/tests/bson-corpus/decimal128-3-valid-060.phpt index 699023e84..2554a2199 100644 --- a/tests/bson-corpus/decimal128-3-valid-060.phpt +++ b/tests/bson-corpus/decimal128-3-valid-060.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000463000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0E+3"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.00E+5"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000463000 -180000001364000000000000000000000000000000463000 -{"d":{"$numberDecimal":"0E+3"}} {"d":{"$numberDecimal":"0E+3"}} 180000001364000000000000000000000000000000463000 180000001364000000000000000000000000000000463000 -180000001364000000000000000000000000000000463000 -180000001364000000000000000000000000000000463000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-061.phpt b/tests/bson-corpus/decimal128-3-valid-061.phpt index 42bd9a835..92b9266ee 100644 --- a/tests/bson-corpus/decimal128-3-valid-061.phpt +++ b/tests/bson-corpus/decimal128-3-valid-061.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000323000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0E-7"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.00E-5"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000323000 -180000001364000000000000000000000000000000323000 -{"d":{"$numberDecimal":"0E-7"}} {"d":{"$numberDecimal":"0E-7"}} 180000001364000000000000000000000000000000323000 180000001364000000000000000000000000000000323000 -180000001364000000000000000000000000000000323000 -180000001364000000000000000000000000000000323000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-062.phpt b/tests/bson-corpus/decimal128-3-valid-062.phpt index cea9ebd3f..2a0976728 100644 --- a/tests/bson-corpus/decimal128-3-valid-062.phpt +++ b/tests/bson-corpus/decimal128-3-valid-062.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000483000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0E+4"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.00E+6"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000483000 -180000001364000000000000000000000000000000483000 -{"d":{"$numberDecimal":"0E+4"}} {"d":{"$numberDecimal":"0E+4"}} 180000001364000000000000000000000000000000483000 180000001364000000000000000000000000000000483000 -180000001364000000000000000000000000000000483000 -180000001364000000000000000000000000000000483000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-063.phpt b/tests/bson-corpus/decimal128-3-valid-063.phpt index 41fd26ffa..386128912 100644 --- a/tests/bson-corpus/decimal128-3-valid-063.phpt +++ b/tests/bson-corpus/decimal128-3-valid-063.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000303000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0E-8"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.00E-6"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000303000 -180000001364000000000000000000000000000000303000 -{"d":{"$numberDecimal":"0E-8"}} {"d":{"$numberDecimal":"0E-8"}} 180000001364000000000000000000000000000000303000 180000001364000000000000000000000000000000303000 -180000001364000000000000000000000000000000303000 -180000001364000000000000000000000000000000303000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-064.phpt b/tests/bson-corpus/decimal128-3-valid-064.phpt index 1de8cc5b0..5e1c80920 100644 --- a/tests/bson-corpus/decimal128-3-valid-064.phpt +++ b/tests/bson-corpus/decimal128-3-valid-064.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('1800000013640000000000000000000000000000004A3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0E+5"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.00E+7"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 1800000013640000000000000000000000000000004a3000 -1800000013640000000000000000000000000000004a3000 -{"d":{"$numberDecimal":"0E+5"}} {"d":{"$numberDecimal":"0E+5"}} 1800000013640000000000000000000000000000004a3000 1800000013640000000000000000000000000000004a3000 -1800000013640000000000000000000000000000004a3000 -1800000013640000000000000000000000000000004a3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-065.phpt b/tests/bson-corpus/decimal128-3-valid-065.phpt index aedec0be1..c3bf05d2e 100644 --- a/tests/bson-corpus/decimal128-3-valid-065.phpt +++ b/tests/bson-corpus/decimal128-3-valid-065.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('1800000013640000000000000000000000000000002E3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0E-9"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.00E-7"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 1800000013640000000000000000000000000000002e3000 -1800000013640000000000000000000000000000002e3000 -{"d":{"$numberDecimal":"0E-9"}} {"d":{"$numberDecimal":"0E-9"}} 1800000013640000000000000000000000000000002e3000 1800000013640000000000000000000000000000002e3000 -1800000013640000000000000000000000000000002e3000 -1800000013640000000000000000000000000000002e3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-066.phpt b/tests/bson-corpus/decimal128-3-valid-066.phpt index a30cdb682..f241caea8 100644 --- a/tests/bson-corpus/decimal128-3-valid-066.phpt +++ b/tests/bson-corpus/decimal128-3-valid-066.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('1800000013640000000000000000000000000000004C3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0E+6"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.00E+8"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 1800000013640000000000000000000000000000004c3000 -1800000013640000000000000000000000000000004c3000 -{"d":{"$numberDecimal":"0E+6"}} {"d":{"$numberDecimal":"0E+6"}} 1800000013640000000000000000000000000000004c3000 1800000013640000000000000000000000000000004c3000 -1800000013640000000000000000000000000000004c3000 -1800000013640000000000000000000000000000004c3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-067.phpt b/tests/bson-corpus/decimal128-3-valid-067.phpt index 5f8c714bb..bf8fb23a8 100644 --- a/tests/bson-corpus/decimal128-3-valid-067.phpt +++ b/tests/bson-corpus/decimal128-3-valid-067.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('1800000013640000000000000000000000000000002C3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0E-10"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.00E-8"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 1800000013640000000000000000000000000000002c3000 -1800000013640000000000000000000000000000002c3000 -{"d":{"$numberDecimal":"0E-10"}} {"d":{"$numberDecimal":"0E-10"}} 1800000013640000000000000000000000000000002c3000 1800000013640000000000000000000000000000002c3000 -1800000013640000000000000000000000000000002c3000 -1800000013640000000000000000000000000000002c3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-068.phpt b/tests/bson-corpus/decimal128-3-valid-068.phpt index 5e3d7b953..9ca7092d0 100644 --- a/tests/bson-corpus/decimal128-3-valid-068.phpt +++ b/tests/bson-corpus/decimal128-3-valid-068.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000523000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0E+9"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "000E+9"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000523000 -180000001364000000000000000000000000000000523000 -{"d":{"$numberDecimal":"0E+9"}} {"d":{"$numberDecimal":"0E+9"}} 180000001364000000000000000000000000000000523000 180000001364000000000000000000000000000000523000 -180000001364000000000000000000000000000000523000 -180000001364000000000000000000000000000000523000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-069.phpt b/tests/bson-corpus/decimal128-3-valid-069.phpt index a5501b408..1e38b5603 100644 --- a/tests/bson-corpus/decimal128-3-valid-069.phpt +++ b/tests/bson-corpus/decimal128-3-valid-069.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('1800000013640000000000000000000000000000004E3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0E+7"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.00E+9"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 1800000013640000000000000000000000000000004e3000 -1800000013640000000000000000000000000000004e3000 -{"d":{"$numberDecimal":"0E+7"}} {"d":{"$numberDecimal":"0E+7"}} 1800000013640000000000000000000000000000004e3000 1800000013640000000000000000000000000000004e3000 -1800000013640000000000000000000000000000004e3000 -1800000013640000000000000000000000000000004e3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-070.phpt b/tests/bson-corpus/decimal128-3-valid-070.phpt index ee0fd5fa5..28d48f3cd 100644 --- a/tests/bson-corpus/decimal128-3-valid-070.phpt +++ b/tests/bson-corpus/decimal128-3-valid-070.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('1800000013640000000000000000000000000000002A3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0E-11"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.00E-9"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 1800000013640000000000000000000000000000002a3000 -1800000013640000000000000000000000000000002a3000 -{"d":{"$numberDecimal":"0E-11"}} {"d":{"$numberDecimal":"0E-11"}} 1800000013640000000000000000000000000000002a3000 1800000013640000000000000000000000000000002a3000 -1800000013640000000000000000000000000000002a3000 -1800000013640000000000000000000000000000002a3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-071.phpt b/tests/bson-corpus/decimal128-3-valid-071.phpt index 102618016..48f82056e 100644 --- a/tests/bson-corpus/decimal128-3-valid-071.phpt +++ b/tests/bson-corpus/decimal128-3-valid-071.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400185C0ACE00000000000000000000383000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "345678.5432"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "+00345678.5432"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400185c0ace00000000000000000000383000 -18000000136400185c0ace00000000000000000000383000 -{"d":{"$numberDecimal":"345678.5432"}} {"d":{"$numberDecimal":"345678.5432"}} 18000000136400185c0ace00000000000000000000383000 18000000136400185c0ace00000000000000000000383000 -18000000136400185c0ace00000000000000000000383000 -18000000136400185c0ace00000000000000000000383000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-072.phpt b/tests/bson-corpus/decimal128-3-valid-072.phpt index 6b2043ea8..be12c99d6 100644 --- a/tests/bson-corpus/decimal128-3-valid-072.phpt +++ b/tests/bson-corpus/decimal128-3-valid-072.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1800000013640000000000000000000000000000003EB000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-0.0"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1800000013640000000000000000000000000000003eb000 -1800000013640000000000000000000000000000003eb000 -{"d":{"$numberDecimal":"-0.0"}} {"d":{"$numberDecimal":"-0.0"}} 1800000013640000000000000000000000000000003eb000 -1800000013640000000000000000000000000000003eb000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-073.phpt b/tests/bson-corpus/decimal128-3-valid-073.phpt index e041ae9fc..e7c0ff398 100644 --- a/tests/bson-corpus/decimal128-3-valid-073.phpt +++ b/tests/bson-corpus/decimal128-3-valid-073.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1800000013640000000000000000000000000000003E3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.0"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1800000013640000000000000000000000000000003e3000 -1800000013640000000000000000000000000000003e3000 -{"d":{"$numberDecimal":"0.0"}} {"d":{"$numberDecimal":"0.0"}} 1800000013640000000000000000000000000000003e3000 -1800000013640000000000000000000000000000003e3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-074.phpt b/tests/bson-corpus/decimal128-3-valid-074.phpt index ab6ef9725..f12b64280 100644 --- a/tests/bson-corpus/decimal128-3-valid-074.phpt +++ b/tests/bson-corpus/decimal128-3-valid-074.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1800000013640000000000000000000000000000003EB000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-0.0"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1800000013640000000000000000000000000000003eb000 -1800000013640000000000000000000000000000003eb000 -{"d":{"$numberDecimal":"-0.0"}} {"d":{"$numberDecimal":"-0.0"}} 1800000013640000000000000000000000000000003eb000 -1800000013640000000000000000000000000000003eb000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-075.phpt b/tests/bson-corpus/decimal128-3-valid-075.phpt index 8337bdf43..1beac4e7f 100644 --- a/tests/bson-corpus/decimal128-3-valid-075.phpt +++ b/tests/bson-corpus/decimal128-3-valid-075.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "00."}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000403000 -180000001364000000000000000000000000000000403000 -{"d":{"$numberDecimal":"0"}} {"d":{"$numberDecimal":"0"}} 180000001364000000000000000000000000000000403000 180000001364000000000000000000000000000000403000 -180000001364000000000000000000000000000000403000 -180000001364000000000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-076.phpt b/tests/bson-corpus/decimal128-3-valid-076.phpt index 700d54320..d99657413 100644 --- a/tests/bson-corpus/decimal128-3-valid-076.phpt +++ b/tests/bson-corpus/decimal128-3-valid-076.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('1800000013640000000000000000000000000000003E3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.0"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.0E+0"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 1800000013640000000000000000000000000000003e3000 -1800000013640000000000000000000000000000003e3000 -{"d":{"$numberDecimal":"0.0"}} {"d":{"$numberDecimal":"0.0"}} 1800000013640000000000000000000000000000003e3000 1800000013640000000000000000000000000000003e3000 -1800000013640000000000000000000000000000003e3000 -1800000013640000000000000000000000000000003e3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-077.phpt b/tests/bson-corpus/decimal128-3-valid-077.phpt index fc60c1b97..9591e685a 100644 --- a/tests/bson-corpus/decimal128-3-valid-077.phpt +++ b/tests/bson-corpus/decimal128-3-valid-077.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('1800000013640000000000000000000000000000003E3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.0"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.0E-0"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 1800000013640000000000000000000000000000003e3000 -1800000013640000000000000000000000000000003e3000 -{"d":{"$numberDecimal":"0.0"}} {"d":{"$numberDecimal":"0.0"}} 1800000013640000000000000000000000000000003e3000 1800000013640000000000000000000000000000003e3000 -1800000013640000000000000000000000000000003e3000 -1800000013640000000000000000000000000000003e3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-078.phpt b/tests/bson-corpus/decimal128-3-valid-078.phpt index 859799a3d..4ca3b0510 100644 --- a/tests/bson-corpus/decimal128-3-valid-078.phpt +++ b/tests/bson-corpus/decimal128-3-valid-078.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.0E+1"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000403000 -180000001364000000000000000000000000000000403000 -{"d":{"$numberDecimal":"0"}} {"d":{"$numberDecimal":"0"}} 180000001364000000000000000000000000000000403000 180000001364000000000000000000000000000000403000 -180000001364000000000000000000000000000000403000 -180000001364000000000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-079.phpt b/tests/bson-corpus/decimal128-3-valid-079.phpt index b5d3b8804..f8bf88172 100644 --- a/tests/bson-corpus/decimal128-3-valid-079.phpt +++ b/tests/bson-corpus/decimal128-3-valid-079.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('1800000013640000000000000000000000000000003C3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.00"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.0E-1"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 1800000013640000000000000000000000000000003c3000 -1800000013640000000000000000000000000000003c3000 -{"d":{"$numberDecimal":"0.00"}} {"d":{"$numberDecimal":"0.00"}} 1800000013640000000000000000000000000000003c3000 1800000013640000000000000000000000000000003c3000 -1800000013640000000000000000000000000000003c3000 -1800000013640000000000000000000000000000003c3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-080.phpt b/tests/bson-corpus/decimal128-3-valid-080.phpt index 4fe58ad56..bb8df2e45 100644 --- a/tests/bson-corpus/decimal128-3-valid-080.phpt +++ b/tests/bson-corpus/decimal128-3-valid-080.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('1800000013640000000000000000000000000000003AB000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-0.000"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "-0.0E-2"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 1800000013640000000000000000000000000000003ab000 -1800000013640000000000000000000000000000003ab000 -{"d":{"$numberDecimal":"-0.000"}} {"d":{"$numberDecimal":"-0.000"}} 1800000013640000000000000000000000000000003ab000 1800000013640000000000000000000000000000003ab000 -1800000013640000000000000000000000000000003ab000 -1800000013640000000000000000000000000000003ab000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-081.phpt b/tests/bson-corpus/decimal128-3-valid-081.phpt index 7cc3029e8..a3e07ad07 100644 --- a/tests/bson-corpus/decimal128-3-valid-081.phpt +++ b/tests/bson-corpus/decimal128-3-valid-081.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000423000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0E+1"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.0E+2"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000423000 -180000001364000000000000000000000000000000423000 -{"d":{"$numberDecimal":"0E+1"}} {"d":{"$numberDecimal":"0E+1"}} 180000001364000000000000000000000000000000423000 180000001364000000000000000000000000000000423000 -180000001364000000000000000000000000000000423000 -180000001364000000000000000000000000000000423000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-082.phpt b/tests/bson-corpus/decimal128-3-valid-082.phpt index 3dddd4185..1544dc87e 100644 --- a/tests/bson-corpus/decimal128-3-valid-082.phpt +++ b/tests/bson-corpus/decimal128-3-valid-082.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('1800000013640000000000000000000000000000003A3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.000"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.0E-2"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 1800000013640000000000000000000000000000003a3000 -1800000013640000000000000000000000000000003a3000 -{"d":{"$numberDecimal":"0.000"}} {"d":{"$numberDecimal":"0.000"}} 1800000013640000000000000000000000000000003a3000 1800000013640000000000000000000000000000003a3000 -1800000013640000000000000000000000000000003a3000 -1800000013640000000000000000000000000000003a3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-083.phpt b/tests/bson-corpus/decimal128-3-valid-083.phpt index 3235678a5..5db68959f 100644 --- a/tests/bson-corpus/decimal128-3-valid-083.phpt +++ b/tests/bson-corpus/decimal128-3-valid-083.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400000000000000000000000000000038B000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-0.0000"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "-0.0E-3"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400000000000000000000000000000038b000 -18000000136400000000000000000000000000000038b000 -{"d":{"$numberDecimal":"-0.0000"}} {"d":{"$numberDecimal":"-0.0000"}} 18000000136400000000000000000000000000000038b000 18000000136400000000000000000000000000000038b000 -18000000136400000000000000000000000000000038b000 -18000000136400000000000000000000000000000038b000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-084.phpt b/tests/bson-corpus/decimal128-3-valid-084.phpt index 5baa8b187..aa1695a7c 100644 --- a/tests/bson-corpus/decimal128-3-valid-084.phpt +++ b/tests/bson-corpus/decimal128-3-valid-084.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000443000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0E+2"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.0E+3"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000443000 -180000001364000000000000000000000000000000443000 -{"d":{"$numberDecimal":"0E+2"}} {"d":{"$numberDecimal":"0E+2"}} 180000001364000000000000000000000000000000443000 180000001364000000000000000000000000000000443000 -180000001364000000000000000000000000000000443000 -180000001364000000000000000000000000000000443000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-085.phpt b/tests/bson-corpus/decimal128-3-valid-085.phpt index a0429d9b0..ce1610012 100644 --- a/tests/bson-corpus/decimal128-3-valid-085.phpt +++ b/tests/bson-corpus/decimal128-3-valid-085.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000383000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.0000"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.0E-3"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000383000 -180000001364000000000000000000000000000000383000 -{"d":{"$numberDecimal":"0.0000"}} {"d":{"$numberDecimal":"0.0000"}} 180000001364000000000000000000000000000000383000 180000001364000000000000000000000000000000383000 -180000001364000000000000000000000000000000383000 -180000001364000000000000000000000000000000383000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-086.phpt b/tests/bson-corpus/decimal128-3-valid-086.phpt index caf7efefb..9a3163abe 100644 --- a/tests/bson-corpus/decimal128-3-valid-086.phpt +++ b/tests/bson-corpus/decimal128-3-valid-086.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000463000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0E+3"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.0E+4"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000463000 -180000001364000000000000000000000000000000463000 -{"d":{"$numberDecimal":"0E+3"}} {"d":{"$numberDecimal":"0E+3"}} 180000001364000000000000000000000000000000463000 180000001364000000000000000000000000000000463000 -180000001364000000000000000000000000000000463000 -180000001364000000000000000000000000000000463000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-087.phpt b/tests/bson-corpus/decimal128-3-valid-087.phpt index 751e0c64b..f7c72b0c0 100644 --- a/tests/bson-corpus/decimal128-3-valid-087.phpt +++ b/tests/bson-corpus/decimal128-3-valid-087.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000363000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.00000"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.0E-4"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000363000 -180000001364000000000000000000000000000000363000 -{"d":{"$numberDecimal":"0.00000"}} {"d":{"$numberDecimal":"0.00000"}} 180000001364000000000000000000000000000000363000 180000001364000000000000000000000000000000363000 -180000001364000000000000000000000000000000363000 -180000001364000000000000000000000000000000363000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-088.phpt b/tests/bson-corpus/decimal128-3-valid-088.phpt index 2ee34f600..f44c8215e 100644 --- a/tests/bson-corpus/decimal128-3-valid-088.phpt +++ b/tests/bson-corpus/decimal128-3-valid-088.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000483000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0E+4"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.0E+5"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000483000 -180000001364000000000000000000000000000000483000 -{"d":{"$numberDecimal":"0E+4"}} {"d":{"$numberDecimal":"0E+4"}} 180000001364000000000000000000000000000000483000 180000001364000000000000000000000000000000483000 -180000001364000000000000000000000000000000483000 -180000001364000000000000000000000000000000483000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-089.phpt b/tests/bson-corpus/decimal128-3-valid-089.phpt index d83aa8a30..8867c7da1 100644 --- a/tests/bson-corpus/decimal128-3-valid-089.phpt +++ b/tests/bson-corpus/decimal128-3-valid-089.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000343000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.000000"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.0E-5"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000343000 -180000001364000000000000000000000000000000343000 -{"d":{"$numberDecimal":"0.000000"}} {"d":{"$numberDecimal":"0.000000"}} 180000001364000000000000000000000000000000343000 180000001364000000000000000000000000000000343000 -180000001364000000000000000000000000000000343000 -180000001364000000000000000000000000000000343000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-090.phpt b/tests/bson-corpus/decimal128-3-valid-090.phpt index c86b2d4b3..329ad3f1c 100644 --- a/tests/bson-corpus/decimal128-3-valid-090.phpt +++ b/tests/bson-corpus/decimal128-3-valid-090.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('1800000013640000000000000000000000000000004A3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0E+5"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.0E+6"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 1800000013640000000000000000000000000000004a3000 -1800000013640000000000000000000000000000004a3000 -{"d":{"$numberDecimal":"0E+5"}} {"d":{"$numberDecimal":"0E+5"}} 1800000013640000000000000000000000000000004a3000 1800000013640000000000000000000000000000004a3000 -1800000013640000000000000000000000000000004a3000 -1800000013640000000000000000000000000000004a3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-091.phpt b/tests/bson-corpus/decimal128-3-valid-091.phpt index c6edce09b..7a30a680d 100644 --- a/tests/bson-corpus/decimal128-3-valid-091.phpt +++ b/tests/bson-corpus/decimal128-3-valid-091.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000323000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0E-7"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.0E-6"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000323000 -180000001364000000000000000000000000000000323000 -{"d":{"$numberDecimal":"0E-7"}} {"d":{"$numberDecimal":"0E-7"}} 180000001364000000000000000000000000000000323000 180000001364000000000000000000000000000000323000 -180000001364000000000000000000000000000000323000 -180000001364000000000000000000000000000000323000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-092.phpt b/tests/bson-corpus/decimal128-3-valid-092.phpt index 71779d7a7..cb0908665 100644 --- a/tests/bson-corpus/decimal128-3-valid-092.phpt +++ b/tests/bson-corpus/decimal128-3-valid-092.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('1800000013640000000000000000000000000000004C3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0E+6"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.0E+7"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 1800000013640000000000000000000000000000004c3000 -1800000013640000000000000000000000000000004c3000 -{"d":{"$numberDecimal":"0E+6"}} {"d":{"$numberDecimal":"0E+6"}} 1800000013640000000000000000000000000000004c3000 1800000013640000000000000000000000000000004c3000 -1800000013640000000000000000000000000000004c3000 -1800000013640000000000000000000000000000004c3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-093.phpt b/tests/bson-corpus/decimal128-3-valid-093.phpt index a3b632e1b..e0a3a88f1 100644 --- a/tests/bson-corpus/decimal128-3-valid-093.phpt +++ b/tests/bson-corpus/decimal128-3-valid-093.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000303000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0E-8"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.0E-7"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000303000 -180000001364000000000000000000000000000000303000 -{"d":{"$numberDecimal":"0E-8"}} {"d":{"$numberDecimal":"0E-8"}} 180000001364000000000000000000000000000000303000 180000001364000000000000000000000000000000303000 -180000001364000000000000000000000000000000303000 -180000001364000000000000000000000000000000303000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-094.phpt b/tests/bson-corpus/decimal128-3-valid-094.phpt index b3473e0db..19269baf7 100644 --- a/tests/bson-corpus/decimal128-3-valid-094.phpt +++ b/tests/bson-corpus/decimal128-3-valid-094.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('1800000013640000000000000000000000000000004E3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0E+7"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.0E+8"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 1800000013640000000000000000000000000000004e3000 -1800000013640000000000000000000000000000004e3000 -{"d":{"$numberDecimal":"0E+7"}} {"d":{"$numberDecimal":"0E+7"}} 1800000013640000000000000000000000000000004e3000 1800000013640000000000000000000000000000004e3000 -1800000013640000000000000000000000000000004e3000 -1800000013640000000000000000000000000000004e3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-095.phpt b/tests/bson-corpus/decimal128-3-valid-095.phpt index 826be1650..39dc48f2f 100644 --- a/tests/bson-corpus/decimal128-3-valid-095.phpt +++ b/tests/bson-corpus/decimal128-3-valid-095.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('1800000013640000000000000000000000000000002E3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0E-9"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.0E-8"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 1800000013640000000000000000000000000000002e3000 -1800000013640000000000000000000000000000002e3000 -{"d":{"$numberDecimal":"0E-9"}} {"d":{"$numberDecimal":"0E-9"}} 1800000013640000000000000000000000000000002e3000 1800000013640000000000000000000000000000002e3000 -1800000013640000000000000000000000000000002e3000 -1800000013640000000000000000000000000000002e3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-096.phpt b/tests/bson-corpus/decimal128-3-valid-096.phpt index 87bae0a2e..ecf1097da 100644 --- a/tests/bson-corpus/decimal128-3-valid-096.phpt +++ b/tests/bson-corpus/decimal128-3-valid-096.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000523000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0E+9"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "00E+9"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000523000 -180000001364000000000000000000000000000000523000 -{"d":{"$numberDecimal":"0E+9"}} {"d":{"$numberDecimal":"0E+9"}} 180000001364000000000000000000000000000000523000 180000001364000000000000000000000000000000523000 -180000001364000000000000000000000000000000523000 -180000001364000000000000000000000000000000523000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-097.phpt b/tests/bson-corpus/decimal128-3-valid-097.phpt index dffeb73c4..d6546cd8e 100644 --- a/tests/bson-corpus/decimal128-3-valid-097.phpt +++ b/tests/bson-corpus/decimal128-3-valid-097.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('1800000013640000000000000000000000000000002E3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0E-9"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "00E-9"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 1800000013640000000000000000000000000000002e3000 -1800000013640000000000000000000000000000002e3000 -{"d":{"$numberDecimal":"0E-9"}} {"d":{"$numberDecimal":"0E-9"}} 1800000013640000000000000000000000000000002e3000 1800000013640000000000000000000000000000002e3000 -1800000013640000000000000000000000000000002e3000 -1800000013640000000000000000000000000000002e3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-098.phpt b/tests/bson-corpus/decimal128-3-valid-098.phpt index 8e24f65e4..11576d4e2 100644 --- a/tests/bson-corpus/decimal128-3-valid-098.phpt +++ b/tests/bson-corpus/decimal128-3-valid-098.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000503000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0E+8"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.0E+9"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000503000 -180000001364000000000000000000000000000000503000 -{"d":{"$numberDecimal":"0E+8"}} {"d":{"$numberDecimal":"0E+8"}} 180000001364000000000000000000000000000000503000 180000001364000000000000000000000000000000503000 -180000001364000000000000000000000000000000503000 -180000001364000000000000000000000000000000503000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-099.phpt b/tests/bson-corpus/decimal128-3-valid-099.phpt index 55c3e05c6..b2265b02f 100644 --- a/tests/bson-corpus/decimal128-3-valid-099.phpt +++ b/tests/bson-corpus/decimal128-3-valid-099.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('1800000013640000000000000000000000000000002C3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0E-10"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.0E-9"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 1800000013640000000000000000000000000000002c3000 -1800000013640000000000000000000000000000002c3000 -{"d":{"$numberDecimal":"0E-10"}} {"d":{"$numberDecimal":"0E-10"}} 1800000013640000000000000000000000000000002c3000 1800000013640000000000000000000000000000002c3000 -1800000013640000000000000000000000000000002c3000 -1800000013640000000000000000000000000000002c3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-100.phpt b/tests/bson-corpus/decimal128-3-valid-100.phpt index 82caad86d..0c8c4ba0b 100644 --- a/tests/bson-corpus/decimal128-3-valid-100.phpt +++ b/tests/bson-corpus/decimal128-3-valid-100.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400185C0ACE00000000000000000000383000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "345678.5432"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "+0345678.5432"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400185c0ace00000000000000000000383000 -18000000136400185c0ace00000000000000000000383000 -{"d":{"$numberDecimal":"345678.5432"}} {"d":{"$numberDecimal":"345678.5432"}} 18000000136400185c0ace00000000000000000000383000 18000000136400185c0ace00000000000000000000383000 -18000000136400185c0ace00000000000000000000383000 -18000000136400185c0ace00000000000000000000383000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-101.phpt b/tests/bson-corpus/decimal128-3-valid-101.phpt index 9428a9db1..970bbd49b 100644 --- a/tests/bson-corpus/decimal128-3-valid-101.phpt +++ b/tests/bson-corpus/decimal128-3-valid-101.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000000000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000000000000000000000000000000403000 -180000001364000000000000000000000000000000403000 -{"d":{"$numberDecimal":"0"}} {"d":{"$numberDecimal":"0"}} 180000001364000000000000000000000000000000403000 -180000001364000000000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-102.phpt b/tests/bson-corpus/decimal128-3-valid-102.phpt index 0d7224b3e..bd4e03e71 100644 --- a/tests/bson-corpus/decimal128-3-valid-102.phpt +++ b/tests/bson-corpus/decimal128-3-valid-102.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400000000000000000000000000000040B000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-0"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400000000000000000000000000000040b000 -18000000136400000000000000000000000000000040b000 -{"d":{"$numberDecimal":"-0"}} {"d":{"$numberDecimal":"-0"}} 18000000136400000000000000000000000000000040b000 -18000000136400000000000000000000000000000040b000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-103.phpt b/tests/bson-corpus/decimal128-3-valid-103.phpt index 7079266b1..8570c051c 100644 --- a/tests/bson-corpus/decimal128-3-valid-103.phpt +++ b/tests/bson-corpus/decimal128-3-valid-103.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0."}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000403000 -180000001364000000000000000000000000000000403000 -{"d":{"$numberDecimal":"0"}} {"d":{"$numberDecimal":"0"}} 180000001364000000000000000000000000000000403000 180000001364000000000000000000000000000000403000 -180000001364000000000000000000000000000000403000 -180000001364000000000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-104.phpt b/tests/bson-corpus/decimal128-3-valid-104.phpt index 2b40a2f88..2b5efa025 100644 --- a/tests/bson-corpus/decimal128-3-valid-104.phpt +++ b/tests/bson-corpus/decimal128-3-valid-104.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400000000000000000000000000000040B000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-0"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "-0."}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400000000000000000000000000000040b000 -18000000136400000000000000000000000000000040b000 -{"d":{"$numberDecimal":"-0"}} {"d":{"$numberDecimal":"-0"}} 18000000136400000000000000000000000000000040b000 18000000136400000000000000000000000000000040b000 -18000000136400000000000000000000000000000040b000 -18000000136400000000000000000000000000000040b000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-105.phpt b/tests/bson-corpus/decimal128-3-valid-105.phpt index aa938d2ec..ca2861203 100644 --- a/tests/bson-corpus/decimal128-3-valid-105.phpt +++ b/tests/bson-corpus/decimal128-3-valid-105.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0."}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000403000 -180000001364000000000000000000000000000000403000 -{"d":{"$numberDecimal":"0"}} {"d":{"$numberDecimal":"0"}} 180000001364000000000000000000000000000000403000 180000001364000000000000000000000000000000403000 -180000001364000000000000000000000000000000403000 -180000001364000000000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-106.phpt b/tests/bson-corpus/decimal128-3-valid-106.phpt index d5cb1dc54..2d099fc00 100644 --- a/tests/bson-corpus/decimal128-3-valid-106.phpt +++ b/tests/bson-corpus/decimal128-3-valid-106.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "+0."}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000403000 -180000001364000000000000000000000000000000403000 -{"d":{"$numberDecimal":"0"}} {"d":{"$numberDecimal":"0"}} 180000001364000000000000000000000000000000403000 180000001364000000000000000000000000000000403000 -180000001364000000000000000000000000000000403000 -180000001364000000000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-107.phpt b/tests/bson-corpus/decimal128-3-valid-107.phpt index 60ea58f77..7962826c4 100644 --- a/tests/bson-corpus/decimal128-3-valid-107.phpt +++ b/tests/bson-corpus/decimal128-3-valid-107.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400000000000000000000000000000040B000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-0"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "-0."}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400000000000000000000000000000040b000 -18000000136400000000000000000000000000000040b000 -{"d":{"$numberDecimal":"-0"}} {"d":{"$numberDecimal":"-0"}} 18000000136400000000000000000000000000000040b000 18000000136400000000000000000000000000000040b000 -18000000136400000000000000000000000000000040b000 -18000000136400000000000000000000000000000040b000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-108.phpt b/tests/bson-corpus/decimal128-3-valid-108.phpt index 761153dc0..61363cbd8 100644 --- a/tests/bson-corpus/decimal128-3-valid-108.phpt +++ b/tests/bson-corpus/decimal128-3-valid-108.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0E+0"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000403000 -180000001364000000000000000000000000000000403000 -{"d":{"$numberDecimal":"0"}} {"d":{"$numberDecimal":"0"}} 180000001364000000000000000000000000000000403000 180000001364000000000000000000000000000000403000 -180000001364000000000000000000000000000000403000 -180000001364000000000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-109.phpt b/tests/bson-corpus/decimal128-3-valid-109.phpt index 2ee1eef62..26430eda9 100644 --- a/tests/bson-corpus/decimal128-3-valid-109.phpt +++ b/tests/bson-corpus/decimal128-3-valid-109.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000000000000000000000000000000423000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0E+1"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000000000000000000000000000000423000 -180000001364000000000000000000000000000000423000 -{"d":{"$numberDecimal":"0E+1"}} {"d":{"$numberDecimal":"0E+1"}} 180000001364000000000000000000000000000000423000 -180000001364000000000000000000000000000000423000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-110.phpt b/tests/bson-corpus/decimal128-3-valid-110.phpt index 659b396f6..9743d4ae8 100644 --- a/tests/bson-corpus/decimal128-3-valid-110.phpt +++ b/tests/bson-corpus/decimal128-3-valid-110.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('1800000013640000000000000000000000000000003CB000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-0.00"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "-0E-2"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 1800000013640000000000000000000000000000003cb000 -1800000013640000000000000000000000000000003cb000 -{"d":{"$numberDecimal":"-0.00"}} {"d":{"$numberDecimal":"-0.00"}} 1800000013640000000000000000000000000000003cb000 1800000013640000000000000000000000000000003cb000 -1800000013640000000000000000000000000000003cb000 -1800000013640000000000000000000000000000003cb000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-111.phpt b/tests/bson-corpus/decimal128-3-valid-111.phpt index 59edd02a2..7788c3216 100644 --- a/tests/bson-corpus/decimal128-3-valid-111.phpt +++ b/tests/bson-corpus/decimal128-3-valid-111.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000000000000000000000000000000443000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0E+2"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000000000000000000000000000000443000 -180000001364000000000000000000000000000000443000 -{"d":{"$numberDecimal":"0E+2"}} {"d":{"$numberDecimal":"0E+2"}} 180000001364000000000000000000000000000000443000 -180000001364000000000000000000000000000000443000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-112.phpt b/tests/bson-corpus/decimal128-3-valid-112.phpt index d854af46a..a54dee88a 100644 --- a/tests/bson-corpus/decimal128-3-valid-112.phpt +++ b/tests/bson-corpus/decimal128-3-valid-112.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('1800000013640000000000000000000000000000003AB000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-0.000"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "-0E-3"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 1800000013640000000000000000000000000000003ab000 -1800000013640000000000000000000000000000003ab000 -{"d":{"$numberDecimal":"-0.000"}} {"d":{"$numberDecimal":"-0.000"}} 1800000013640000000000000000000000000000003ab000 1800000013640000000000000000000000000000003ab000 -1800000013640000000000000000000000000000003ab000 -1800000013640000000000000000000000000000003ab000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-113.phpt b/tests/bson-corpus/decimal128-3-valid-113.phpt index becb7eaeb..c4ba961c5 100644 --- a/tests/bson-corpus/decimal128-3-valid-113.phpt +++ b/tests/bson-corpus/decimal128-3-valid-113.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000000000000000000000000000000463000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0E+3"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000000000000000000000000000000463000 -180000001364000000000000000000000000000000463000 -{"d":{"$numberDecimal":"0E+3"}} {"d":{"$numberDecimal":"0E+3"}} 180000001364000000000000000000000000000000463000 -180000001364000000000000000000000000000000463000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-114.phpt b/tests/bson-corpus/decimal128-3-valid-114.phpt index b91441491..89eee8652 100644 --- a/tests/bson-corpus/decimal128-3-valid-114.phpt +++ b/tests/bson-corpus/decimal128-3-valid-114.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000000000000000000000000000000483000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0E+4"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000000000000000000000000000000483000 -180000001364000000000000000000000000000000483000 -{"d":{"$numberDecimal":"0E+4"}} {"d":{"$numberDecimal":"0E+4"}} 180000001364000000000000000000000000000000483000 -180000001364000000000000000000000000000000483000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-115.phpt b/tests/bson-corpus/decimal128-3-valid-115.phpt index a6fe8d0f3..9bd03b620 100644 --- a/tests/bson-corpus/decimal128-3-valid-115.phpt +++ b/tests/bson-corpus/decimal128-3-valid-115.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1800000013640000000000000000000000000000004A3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0E+5"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1800000013640000000000000000000000000000004a3000 -1800000013640000000000000000000000000000004a3000 -{"d":{"$numberDecimal":"0E+5"}} {"d":{"$numberDecimal":"0E+5"}} 1800000013640000000000000000000000000000004a3000 -1800000013640000000000000000000000000000004a3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-116.phpt b/tests/bson-corpus/decimal128-3-valid-116.phpt index 4cf326ae3..6c92cc464 100644 --- a/tests/bson-corpus/decimal128-3-valid-116.phpt +++ b/tests/bson-corpus/decimal128-3-valid-116.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1800000013640000000000000000000000000000004C3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0E+6"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1800000013640000000000000000000000000000004c3000 -1800000013640000000000000000000000000000004c3000 -{"d":{"$numberDecimal":"0E+6"}} {"d":{"$numberDecimal":"0E+6"}} 1800000013640000000000000000000000000000004c3000 -1800000013640000000000000000000000000000004c3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-117.phpt b/tests/bson-corpus/decimal128-3-valid-117.phpt index a14cb53a9..ee273c949 100644 --- a/tests/bson-corpus/decimal128-3-valid-117.phpt +++ b/tests/bson-corpus/decimal128-3-valid-117.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1800000013640000000000000000000000000000004E3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0E+7"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1800000013640000000000000000000000000000004e3000 -1800000013640000000000000000000000000000004e3000 -{"d":{"$numberDecimal":"0E+7"}} {"d":{"$numberDecimal":"0E+7"}} 1800000013640000000000000000000000000000004e3000 -1800000013640000000000000000000000000000004e3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-118.phpt b/tests/bson-corpus/decimal128-3-valid-118.phpt index 0c8ef0a45..06b8f29fc 100644 --- a/tests/bson-corpus/decimal128-3-valid-118.phpt +++ b/tests/bson-corpus/decimal128-3-valid-118.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000000000000000000000000000000503000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0E+8"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000000000000000000000000000000503000 -180000001364000000000000000000000000000000503000 -{"d":{"$numberDecimal":"0E+8"}} {"d":{"$numberDecimal":"0E+8"}} 180000001364000000000000000000000000000000503000 -180000001364000000000000000000000000000000503000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-119.phpt b/tests/bson-corpus/decimal128-3-valid-119.phpt index 2d80824d9..607c2963c 100644 --- a/tests/bson-corpus/decimal128-3-valid-119.phpt +++ b/tests/bson-corpus/decimal128-3-valid-119.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000523000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0E+9"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "+0E+9"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000523000 -180000001364000000000000000000000000000000523000 -{"d":{"$numberDecimal":"0E+9"}} {"d":{"$numberDecimal":"0E+9"}} 180000001364000000000000000000000000000000523000 180000001364000000000000000000000000000000523000 -180000001364000000000000000000000000000000523000 -180000001364000000000000000000000000000000523000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-120.phpt b/tests/bson-corpus/decimal128-3-valid-120.phpt index c8dd1466f..539aeee9a 100644 --- a/tests/bson-corpus/decimal128-3-valid-120.phpt +++ b/tests/bson-corpus/decimal128-3-valid-120.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400000000000000000000000000000052B000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-0E+9"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400000000000000000000000000000052b000 -18000000136400000000000000000000000000000052b000 -{"d":{"$numberDecimal":"-0E+9"}} {"d":{"$numberDecimal":"-0E+9"}} 18000000136400000000000000000000000000000052b000 -18000000136400000000000000000000000000000052b000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-121.phpt b/tests/bson-corpus/decimal128-3-valid-121.phpt index d98595f01..0ad9944a0 100644 --- a/tests/bson-corpus/decimal128-3-valid-121.phpt +++ b/tests/bson-corpus/decimal128-3-valid-121.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000000000000000000000000000000523000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0E+9"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000000000000000000000000000000523000 -180000001364000000000000000000000000000000523000 -{"d":{"$numberDecimal":"0E+9"}} {"d":{"$numberDecimal":"0E+9"}} 180000001364000000000000000000000000000000523000 -180000001364000000000000000000000000000000523000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-122.phpt b/tests/bson-corpus/decimal128-3-valid-122.phpt index 1fbaa59ba..7b7579dac 100644 --- a/tests/bson-corpus/decimal128-3-valid-122.phpt +++ b/tests/bson-corpus/decimal128-3-valid-122.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000523000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0E+9"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0E9"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000523000 -180000001364000000000000000000000000000000523000 -{"d":{"$numberDecimal":"0E+9"}} {"d":{"$numberDecimal":"0E+9"}} 180000001364000000000000000000000000000000523000 180000001364000000000000000000000000000000523000 -180000001364000000000000000000000000000000523000 -180000001364000000000000000000000000000000523000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-123.phpt b/tests/bson-corpus/decimal128-3-valid-123.phpt index 5b6eb59a7..0df8e2542 100644 --- a/tests/bson-corpus/decimal128-3-valid-123.phpt +++ b/tests/bson-corpus/decimal128-3-valid-123.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000000000000000000000000000000523000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0E+9"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000000000000000000000000000000523000 -180000001364000000000000000000000000000000523000 -{"d":{"$numberDecimal":"0E+9"}} {"d":{"$numberDecimal":"0E+9"}} 180000001364000000000000000000000000000000523000 -180000001364000000000000000000000000000000523000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-124.phpt b/tests/bson-corpus/decimal128-3-valid-124.phpt index 3cde36634..aa157c95b 100644 --- a/tests/bson-corpus/decimal128-3-valid-124.phpt +++ b/tests/bson-corpus/decimal128-3-valid-124.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400FC040000000000000000000000003C3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "12.76"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "+12.76"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400fc040000000000000000000000003c3000 -18000000136400fc040000000000000000000000003c3000 -{"d":{"$numberDecimal":"12.76"}} {"d":{"$numberDecimal":"12.76"}} 18000000136400fc040000000000000000000000003c3000 18000000136400fc040000000000000000000000003c3000 -18000000136400fc040000000000000000000000003c3000 -18000000136400fc040000000000000000000000003c3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-125.phpt b/tests/bson-corpus/decimal128-3-valid-125.phpt index 221d668b1..cd190cd27 100644 --- a/tests/bson-corpus/decimal128-3-valid-125.phpt +++ b/tests/bson-corpus/decimal128-3-valid-125.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000100000000000000000000000000523000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1E+9"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "+1E+009"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000100000000000000000000000000523000 -180000001364000100000000000000000000000000523000 -{"d":{"$numberDecimal":"1E+9"}} {"d":{"$numberDecimal":"1E+9"}} 180000001364000100000000000000000000000000523000 180000001364000100000000000000000000000000523000 -180000001364000100000000000000000000000000523000 -180000001364000100000000000000000000000000523000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-126.phpt b/tests/bson-corpus/decimal128-3-valid-126.phpt index 3bf1829ba..549602e65 100644 --- a/tests/bson-corpus/decimal128-3-valid-126.phpt +++ b/tests/bson-corpus/decimal128-3-valid-126.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400185C0ACE00000000000000000000383000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "345678.5432"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "+345678.5432"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400185c0ace00000000000000000000383000 -18000000136400185c0ace00000000000000000000383000 -{"d":{"$numberDecimal":"345678.5432"}} {"d":{"$numberDecimal":"345678.5432"}} 18000000136400185c0ace00000000000000000000383000 18000000136400185c0ace00000000000000000000383000 -18000000136400185c0ace00000000000000000000383000 -18000000136400185c0ace00000000000000000000383000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-127.phpt b/tests/bson-corpus/decimal128-3-valid-127.phpt index 2b1ab4db5..624022cbe 100644 --- a/tests/bson-corpus/decimal128-3-valid-127.phpt +++ b/tests/bson-corpus/decimal128-3-valid-127.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('1800000013640015CD5B0700000000000000000000203000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.23456789E-8"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.0000000123456789"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 1800000013640015cd5b0700000000000000000000203000 -1800000013640015cd5b0700000000000000000000203000 -{"d":{"$numberDecimal":"1.23456789E-8"}} {"d":{"$numberDecimal":"1.23456789E-8"}} 1800000013640015cd5b0700000000000000000000203000 1800000013640015cd5b0700000000000000000000203000 -1800000013640015cd5b0700000000000000000000203000 -1800000013640015cd5b0700000000000000000000203000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-128.phpt b/tests/bson-corpus/decimal128-3-valid-128.phpt index 0bbe5ff85..6e35fcbfa 100644 --- a/tests/bson-corpus/decimal128-3-valid-128.phpt +++ b/tests/bson-corpus/decimal128-3-valid-128.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('1800000013640015CD5B0700000000000000000000223000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.23456789E-7"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.000000123456789"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 1800000013640015cd5b0700000000000000000000223000 -1800000013640015cd5b0700000000000000000000223000 -{"d":{"$numberDecimal":"1.23456789E-7"}} {"d":{"$numberDecimal":"1.23456789E-7"}} 1800000013640015cd5b0700000000000000000000223000 1800000013640015cd5b0700000000000000000000223000 -1800000013640015cd5b0700000000000000000000223000 -1800000013640015cd5b0700000000000000000000223000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-129.phpt b/tests/bson-corpus/decimal128-3-valid-129.phpt index f81729d18..3cbd93df5 100644 --- a/tests/bson-corpus/decimal128-3-valid-129.phpt +++ b/tests/bson-corpus/decimal128-3-valid-129.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1800000013640015CD5B0700000000000000000000243000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.00000123456789"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1800000013640015cd5b0700000000000000000000243000 -1800000013640015cd5b0700000000000000000000243000 -{"d":{"$numberDecimal":"0.00000123456789"}} {"d":{"$numberDecimal":"0.00000123456789"}} 1800000013640015cd5b0700000000000000000000243000 -1800000013640015cd5b0700000000000000000000243000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-130.phpt b/tests/bson-corpus/decimal128-3-valid-130.phpt index 4056ead46..e393f540b 100644 --- a/tests/bson-corpus/decimal128-3-valid-130.phpt +++ b/tests/bson-corpus/decimal128-3-valid-130.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364003200000000000000000000000000323000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.0000050"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364003200000000000000000000000000323000 -180000001364003200000000000000000000000000323000 -{"d":{"$numberDecimal":"0.0000050"}} {"d":{"$numberDecimal":"0.0000050"}} 180000001364003200000000000000000000000000323000 -180000001364003200000000000000000000000000323000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-131.phpt b/tests/bson-corpus/decimal128-3-valid-131.phpt index 54fffcb0c..7762aa850 100644 --- a/tests/bson-corpus/decimal128-3-valid-131.phpt +++ b/tests/bson-corpus/decimal128-3-valid-131.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1800000013640015CD5B0700000000000000000000263000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.0000123456789"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1800000013640015cd5b0700000000000000000000263000 -1800000013640015cd5b0700000000000000000000263000 -{"d":{"$numberDecimal":"0.0000123456789"}} {"d":{"$numberDecimal":"0.0000123456789"}} 1800000013640015cd5b0700000000000000000000263000 -1800000013640015cd5b0700000000000000000000263000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-132.phpt b/tests/bson-corpus/decimal128-3-valid-132.phpt index 0e71fca03..f2b6e4999 100644 --- a/tests/bson-corpus/decimal128-3-valid-132.phpt +++ b/tests/bson-corpus/decimal128-3-valid-132.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000C000000000000000000000000003A3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.012"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000c000000000000000000000000003a3000 -180000001364000c000000000000000000000000003a3000 -{"d":{"$numberDecimal":"0.012"}} {"d":{"$numberDecimal":"0.012"}} 180000001364000c000000000000000000000000003a3000 -180000001364000c000000000000000000000000003a3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-133.phpt b/tests/bson-corpus/decimal128-3-valid-133.phpt index 3b3937091..ce070e5d3 100644 --- a/tests/bson-corpus/decimal128-3-valid-133.phpt +++ b/tests/bson-corpus/decimal128-3-valid-133.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364007B000000000000000000000000003A3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.123"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364007b000000000000000000000000003a3000 -180000001364007b000000000000000000000000003a3000 -{"d":{"$numberDecimal":"0.123"}} {"d":{"$numberDecimal":"0.123"}} 180000001364007b000000000000000000000000003a3000 -180000001364007b000000000000000000000000003a3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-134.phpt b/tests/bson-corpus/decimal128-3-valid-134.phpt index 41360fbd2..ab7fe6115 100644 --- a/tests/bson-corpus/decimal128-3-valid-134.phpt +++ b/tests/bson-corpus/decimal128-3-valid-134.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1800000013640078DF0D8648700000000000000000223000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.123456789012344"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1800000013640078df0d8648700000000000000000223000 -1800000013640078df0d8648700000000000000000223000 -{"d":{"$numberDecimal":"0.123456789012344"}} {"d":{"$numberDecimal":"0.123456789012344"}} 1800000013640078df0d8648700000000000000000223000 -1800000013640078df0d8648700000000000000000223000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-135.phpt b/tests/bson-corpus/decimal128-3-valid-135.phpt index 335db0b38..8fd3e9d95 100644 --- a/tests/bson-corpus/decimal128-3-valid-135.phpt +++ b/tests/bson-corpus/decimal128-3-valid-135.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1800000013640079DF0D8648700000000000000000223000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.123456789012345"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1800000013640079df0d8648700000000000000000223000 -1800000013640079df0d8648700000000000000000223000 -{"d":{"$numberDecimal":"0.123456789012345"}} {"d":{"$numberDecimal":"0.123456789012345"}} 1800000013640079df0d8648700000000000000000223000 -1800000013640079df0d8648700000000000000000223000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-136.phpt b/tests/bson-corpus/decimal128-3-valid-136.phpt index fe5559e06..26d035f9d 100644 --- a/tests/bson-corpus/decimal128-3-valid-136.phpt +++ b/tests/bson-corpus/decimal128-3-valid-136.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400F104000000000000000000000000383000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.1265"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400f104000000000000000000000000383000 -18000000136400f104000000000000000000000000383000 -{"d":{"$numberDecimal":"0.1265"}} {"d":{"$numberDecimal":"0.1265"}} 18000000136400f104000000000000000000000000383000 -18000000136400f104000000000000000000000000383000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-137.phpt b/tests/bson-corpus/decimal128-3-valid-137.phpt index 58a4b52a8..a900bca72 100644 --- a/tests/bson-corpus/decimal128-3-valid-137.phpt +++ b/tests/bson-corpus/decimal128-3-valid-137.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F104000000000000000000000000383000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.1265"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.1265E-0"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f104000000000000000000000000383000 -18000000136400f104000000000000000000000000383000 -{"d":{"$numberDecimal":"0.1265"}} {"d":{"$numberDecimal":"0.1265"}} 18000000136400f104000000000000000000000000383000 18000000136400f104000000000000000000000000383000 -18000000136400f104000000000000000000000000383000 -18000000136400f104000000000000000000000000383000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-138.phpt b/tests/bson-corpus/decimal128-3-valid-138.phpt index 16f901b3f..daa2fd7fc 100644 --- a/tests/bson-corpus/decimal128-3-valid-138.phpt +++ b/tests/bson-corpus/decimal128-3-valid-138.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F104000000000000000000000000363000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.01265"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.1265E-1"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f104000000000000000000000000363000 -18000000136400f104000000000000000000000000363000 -{"d":{"$numberDecimal":"0.01265"}} {"d":{"$numberDecimal":"0.01265"}} 18000000136400f104000000000000000000000000363000 18000000136400f104000000000000000000000000363000 -18000000136400f104000000000000000000000000363000 -18000000136400f104000000000000000000000000363000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-139.phpt b/tests/bson-corpus/decimal128-3-valid-139.phpt index b253906d1..57f108839 100644 --- a/tests/bson-corpus/decimal128-3-valid-139.phpt +++ b/tests/bson-corpus/decimal128-3-valid-139.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F1040000000000000000000000003A3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.265"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.1265E+1"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f1040000000000000000000000003a3000 -18000000136400f1040000000000000000000000003a3000 -{"d":{"$numberDecimal":"1.265"}} {"d":{"$numberDecimal":"1.265"}} 18000000136400f1040000000000000000000000003a3000 18000000136400f1040000000000000000000000003a3000 -18000000136400f1040000000000000000000000003a3000 -18000000136400f1040000000000000000000000003a3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-140.phpt b/tests/bson-corpus/decimal128-3-valid-140.phpt index 1f6687eb0..2dade5a61 100644 --- a/tests/bson-corpus/decimal128-3-valid-140.phpt +++ b/tests/bson-corpus/decimal128-3-valid-140.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F104000000000000000000000000103000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.265E-21"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.1265E-20"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f104000000000000000000000000103000 -18000000136400f104000000000000000000000000103000 -{"d":{"$numberDecimal":"1.265E-21"}} {"d":{"$numberDecimal":"1.265E-21"}} 18000000136400f104000000000000000000000000103000 18000000136400f104000000000000000000000000103000 -18000000136400f104000000000000000000000000103000 -18000000136400f104000000000000000000000000103000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-141.phpt b/tests/bson-corpus/decimal128-3-valid-141.phpt index 818943500..caf987a2d 100644 --- a/tests/bson-corpus/decimal128-3-valid-141.phpt +++ b/tests/bson-corpus/decimal128-3-valid-141.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F104000000000000000000000000603000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.265E+19"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.1265E+20"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f104000000000000000000000000603000 -18000000136400f104000000000000000000000000603000 -{"d":{"$numberDecimal":"1.265E+19"}} {"d":{"$numberDecimal":"1.265E+19"}} 18000000136400f104000000000000000000000000603000 18000000136400f104000000000000000000000000603000 -18000000136400f104000000000000000000000000603000 -18000000136400f104000000000000000000000000603000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-142.phpt b/tests/bson-corpus/decimal128-3-valid-142.phpt index af43a26db..38870cee0 100644 --- a/tests/bson-corpus/decimal128-3-valid-142.phpt +++ b/tests/bson-corpus/decimal128-3-valid-142.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F104000000000000000000000000343000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.001265"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.1265E-2"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f104000000000000000000000000343000 -18000000136400f104000000000000000000000000343000 -{"d":{"$numberDecimal":"0.001265"}} {"d":{"$numberDecimal":"0.001265"}} 18000000136400f104000000000000000000000000343000 18000000136400f104000000000000000000000000343000 -18000000136400f104000000000000000000000000343000 -18000000136400f104000000000000000000000000343000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-143.phpt b/tests/bson-corpus/decimal128-3-valid-143.phpt index 9d0af6f6b..99dfe9338 100644 --- a/tests/bson-corpus/decimal128-3-valid-143.phpt +++ b/tests/bson-corpus/decimal128-3-valid-143.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F1040000000000000000000000003C3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "12.65"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.1265E+2"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f1040000000000000000000000003c3000 -18000000136400f1040000000000000000000000003c3000 -{"d":{"$numberDecimal":"12.65"}} {"d":{"$numberDecimal":"12.65"}} 18000000136400f1040000000000000000000000003c3000 18000000136400f1040000000000000000000000003c3000 -18000000136400f1040000000000000000000000003c3000 -18000000136400f1040000000000000000000000003c3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-144.phpt b/tests/bson-corpus/decimal128-3-valid-144.phpt index 1f6c12e49..7db7a78b7 100644 --- a/tests/bson-corpus/decimal128-3-valid-144.phpt +++ b/tests/bson-corpus/decimal128-3-valid-144.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F104000000000000000000000000323000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.0001265"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.1265E-3"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f104000000000000000000000000323000 -18000000136400f104000000000000000000000000323000 -{"d":{"$numberDecimal":"0.0001265"}} {"d":{"$numberDecimal":"0.0001265"}} 18000000136400f104000000000000000000000000323000 18000000136400f104000000000000000000000000323000 -18000000136400f104000000000000000000000000323000 -18000000136400f104000000000000000000000000323000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-145.phpt b/tests/bson-corpus/decimal128-3-valid-145.phpt index d21aa742f..9ce384883 100644 --- a/tests/bson-corpus/decimal128-3-valid-145.phpt +++ b/tests/bson-corpus/decimal128-3-valid-145.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F1040000000000000000000000003E3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "126.5"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.1265E+3"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f1040000000000000000000000003e3000 -18000000136400f1040000000000000000000000003e3000 -{"d":{"$numberDecimal":"126.5"}} {"d":{"$numberDecimal":"126.5"}} 18000000136400f1040000000000000000000000003e3000 18000000136400f1040000000000000000000000003e3000 -18000000136400f1040000000000000000000000003e3000 -18000000136400f1040000000000000000000000003e3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-146.phpt b/tests/bson-corpus/decimal128-3-valid-146.phpt index 48c43bf88..23b8d74ec 100644 --- a/tests/bson-corpus/decimal128-3-valid-146.phpt +++ b/tests/bson-corpus/decimal128-3-valid-146.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F104000000000000000000000000303000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.00001265"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.1265E-4"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f104000000000000000000000000303000 -18000000136400f104000000000000000000000000303000 -{"d":{"$numberDecimal":"0.00001265"}} {"d":{"$numberDecimal":"0.00001265"}} 18000000136400f104000000000000000000000000303000 18000000136400f104000000000000000000000000303000 -18000000136400f104000000000000000000000000303000 -18000000136400f104000000000000000000000000303000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-147.phpt b/tests/bson-corpus/decimal128-3-valid-147.phpt index 8b0034973..399ce5a88 100644 --- a/tests/bson-corpus/decimal128-3-valid-147.phpt +++ b/tests/bson-corpus/decimal128-3-valid-147.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F104000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1265"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.1265E+4"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f104000000000000000000000000403000 -18000000136400f104000000000000000000000000403000 -{"d":{"$numberDecimal":"1265"}} {"d":{"$numberDecimal":"1265"}} 18000000136400f104000000000000000000000000403000 18000000136400f104000000000000000000000000403000 -18000000136400f104000000000000000000000000403000 -18000000136400f104000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-148.phpt b/tests/bson-corpus/decimal128-3-valid-148.phpt index 1dc9082a4..a17b620be 100644 --- a/tests/bson-corpus/decimal128-3-valid-148.phpt +++ b/tests/bson-corpus/decimal128-3-valid-148.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F104000000000000000000000000283000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.265E-9"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.1265E-8"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f104000000000000000000000000283000 -18000000136400f104000000000000000000000000283000 -{"d":{"$numberDecimal":"1.265E-9"}} {"d":{"$numberDecimal":"1.265E-9"}} 18000000136400f104000000000000000000000000283000 18000000136400f104000000000000000000000000283000 -18000000136400f104000000000000000000000000283000 -18000000136400f104000000000000000000000000283000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-149.phpt b/tests/bson-corpus/decimal128-3-valid-149.phpt index f55401fcc..49e49feb8 100644 --- a/tests/bson-corpus/decimal128-3-valid-149.phpt +++ b/tests/bson-corpus/decimal128-3-valid-149.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F104000000000000000000000000483000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.265E+7"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.1265E+8"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f104000000000000000000000000483000 -18000000136400f104000000000000000000000000483000 -{"d":{"$numberDecimal":"1.265E+7"}} {"d":{"$numberDecimal":"1.265E+7"}} 18000000136400f104000000000000000000000000483000 18000000136400f104000000000000000000000000483000 -18000000136400f104000000000000000000000000483000 -18000000136400f104000000000000000000000000483000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-150.phpt b/tests/bson-corpus/decimal128-3-valid-150.phpt index e4304d99f..d06469bd3 100644 --- a/tests/bson-corpus/decimal128-3-valid-150.phpt +++ b/tests/bson-corpus/decimal128-3-valid-150.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('1800000013640049000000000000000000000000002E3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "7.3E-8"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.73e-7"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 1800000013640049000000000000000000000000002e3000 -1800000013640049000000000000000000000000002e3000 -{"d":{"$numberDecimal":"7.3E-8"}} {"d":{"$numberDecimal":"7.3E-8"}} 1800000013640049000000000000000000000000002e3000 1800000013640049000000000000000000000000002e3000 -1800000013640049000000000000000000000000002e3000 -1800000013640049000000000000000000000000002e3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-151.phpt b/tests/bson-corpus/decimal128-3-valid-151.phpt index fdd43959a..94c72e619 100644 --- a/tests/bson-corpus/decimal128-3-valid-151.phpt +++ b/tests/bson-corpus/decimal128-3-valid-151.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1800000013640064000000000000000000000000003C3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.00"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1800000013640064000000000000000000000000003c3000 -1800000013640064000000000000000000000000003c3000 -{"d":{"$numberDecimal":"1.00"}} {"d":{"$numberDecimal":"1.00"}} 1800000013640064000000000000000000000000003c3000 -1800000013640064000000000000000000000000003c3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-152.phpt b/tests/bson-corpus/decimal128-3-valid-152.phpt index c066a6205..83cb68189 100644 --- a/tests/bson-corpus/decimal128-3-valid-152.phpt +++ b/tests/bson-corpus/decimal128-3-valid-152.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000A000000000000000000000000003E3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.0"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000a000000000000000000000000003e3000 -180000001364000a000000000000000000000000003e3000 -{"d":{"$numberDecimal":"1.0"}} {"d":{"$numberDecimal":"1.0"}} 180000001364000a000000000000000000000000003e3000 -180000001364000a000000000000000000000000003e3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-153.phpt b/tests/bson-corpus/decimal128-3-valid-153.phpt index 5c0776b99..f8e794458 100644 --- a/tests/bson-corpus/decimal128-3-valid-153.phpt +++ b/tests/bson-corpus/decimal128-3-valid-153.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000100000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000100000000000000000000000000403000 -180000001364000100000000000000000000000000403000 -{"d":{"$numberDecimal":"1"}} {"d":{"$numberDecimal":"1"}} 180000001364000100000000000000000000000000403000 -180000001364000100000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-154.phpt b/tests/bson-corpus/decimal128-3-valid-154.phpt index 436e127ab..ef88eb8fc 100644 --- a/tests/bson-corpus/decimal128-3-valid-154.phpt +++ b/tests/bson-corpus/decimal128-3-valid-154.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000100000000000000000000000000523000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1E+9"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1E+009"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000100000000000000000000000000523000 -180000001364000100000000000000000000000000523000 -{"d":{"$numberDecimal":"1E+9"}} {"d":{"$numberDecimal":"1E+9"}} 180000001364000100000000000000000000000000523000 180000001364000100000000000000000000000000523000 -180000001364000100000000000000000000000000523000 -180000001364000100000000000000000000000000523000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-155.phpt b/tests/bson-corpus/decimal128-3-valid-155.phpt index dccbbe3e4..5a08ac047 100644 --- a/tests/bson-corpus/decimal128-3-valid-155.phpt +++ b/tests/bson-corpus/decimal128-3-valid-155.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000100000000000000000000000000523000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1E+9"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1E009"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000100000000000000000000000000523000 -180000001364000100000000000000000000000000523000 -{"d":{"$numberDecimal":"1E+9"}} {"d":{"$numberDecimal":"1E+9"}} 180000001364000100000000000000000000000000523000 180000001364000100000000000000000000000000523000 -180000001364000100000000000000000000000000523000 -180000001364000100000000000000000000000000523000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-156.phpt b/tests/bson-corpus/decimal128-3-valid-156.phpt index fbe35810d..e2843f9d7 100644 --- a/tests/bson-corpus/decimal128-3-valid-156.phpt +++ b/tests/bson-corpus/decimal128-3-valid-156.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000100000000000000000000000000523000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1E+9"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1e+09"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000100000000000000000000000000523000 -180000001364000100000000000000000000000000523000 -{"d":{"$numberDecimal":"1E+9"}} {"d":{"$numberDecimal":"1E+9"}} 180000001364000100000000000000000000000000523000 180000001364000100000000000000000000000000523000 -180000001364000100000000000000000000000000523000 -180000001364000100000000000000000000000000523000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-157.phpt b/tests/bson-corpus/decimal128-3-valid-157.phpt index 3d6de6b4c..fa64c10f2 100644 --- a/tests/bson-corpus/decimal128-3-valid-157.phpt +++ b/tests/bson-corpus/decimal128-3-valid-157.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000100000000000000000000000000523000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1E+9"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1E+09"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000100000000000000000000000000523000 -180000001364000100000000000000000000000000523000 -{"d":{"$numberDecimal":"1E+9"}} {"d":{"$numberDecimal":"1E+9"}} 180000001364000100000000000000000000000000523000 180000001364000100000000000000000000000000523000 -180000001364000100000000000000000000000000523000 -180000001364000100000000000000000000000000523000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-158.phpt b/tests/bson-corpus/decimal128-3-valid-158.phpt index 296e323a7..8036e462f 100644 --- a/tests/bson-corpus/decimal128-3-valid-158.phpt +++ b/tests/bson-corpus/decimal128-3-valid-158.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000100000000000000000000000000523000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1E+9"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1e09"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000100000000000000000000000000523000 -180000001364000100000000000000000000000000523000 -{"d":{"$numberDecimal":"1E+9"}} {"d":{"$numberDecimal":"1E+9"}} 180000001364000100000000000000000000000000523000 180000001364000100000000000000000000000000523000 -180000001364000100000000000000000000000000523000 -180000001364000100000000000000000000000000523000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-159.phpt b/tests/bson-corpus/decimal128-3-valid-159.phpt index a0c713f4e..71761ddde 100644 --- a/tests/bson-corpus/decimal128-3-valid-159.phpt +++ b/tests/bson-corpus/decimal128-3-valid-159.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000100000000000000000000000000F43000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1E+90"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000100000000000000000000000000f43000 -180000001364000100000000000000000000000000f43000 -{"d":{"$numberDecimal":"1E+90"}} {"d":{"$numberDecimal":"1E+90"}} 180000001364000100000000000000000000000000f43000 -180000001364000100000000000000000000000000f43000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-160.phpt b/tests/bson-corpus/decimal128-3-valid-160.phpt index 794c694b8..955aa08c5 100644 --- a/tests/bson-corpus/decimal128-3-valid-160.phpt +++ b/tests/bson-corpus/decimal128-3-valid-160.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000100000000000000000000000000F43000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1E+90"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1e+90"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000100000000000000000000000000f43000 -180000001364000100000000000000000000000000f43000 -{"d":{"$numberDecimal":"1E+90"}} {"d":{"$numberDecimal":"1E+90"}} 180000001364000100000000000000000000000000f43000 180000001364000100000000000000000000000000f43000 -180000001364000100000000000000000000000000f43000 -180000001364000100000000000000000000000000f43000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-161.phpt b/tests/bson-corpus/decimal128-3-valid-161.phpt index 58b9a3df6..6b93a40b1 100644 --- a/tests/bson-corpus/decimal128-3-valid-161.phpt +++ b/tests/bson-corpus/decimal128-3-valid-161.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000100000000000000000000000000F43000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1E+90"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1E90"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000100000000000000000000000000f43000 -180000001364000100000000000000000000000000f43000 -{"d":{"$numberDecimal":"1E+90"}} {"d":{"$numberDecimal":"1E+90"}} 180000001364000100000000000000000000000000f43000 180000001364000100000000000000000000000000f43000 -180000001364000100000000000000000000000000f43000 -180000001364000100000000000000000000000000f43000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-162.phpt b/tests/bson-corpus/decimal128-3-valid-162.phpt index eed28fcc8..416c78004 100644 --- a/tests/bson-corpus/decimal128-3-valid-162.phpt +++ b/tests/bson-corpus/decimal128-3-valid-162.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000100000000000000000000000000523000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1E+9"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000100000000000000000000000000523000 -180000001364000100000000000000000000000000523000 -{"d":{"$numberDecimal":"1E+9"}} {"d":{"$numberDecimal":"1E+9"}} 180000001364000100000000000000000000000000523000 -180000001364000100000000000000000000000000523000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-163.phpt b/tests/bson-corpus/decimal128-3-valid-163.phpt index 36b9afd44..c8a7dbc84 100644 --- a/tests/bson-corpus/decimal128-3-valid-163.phpt +++ b/tests/bson-corpus/decimal128-3-valid-163.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000100000000000000000000000000523000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1E+9"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1E9"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000100000000000000000000000000523000 -180000001364000100000000000000000000000000523000 -{"d":{"$numberDecimal":"1E+9"}} {"d":{"$numberDecimal":"1E+9"}} 180000001364000100000000000000000000000000523000 180000001364000100000000000000000000000000523000 -180000001364000100000000000000000000000000523000 -180000001364000100000000000000000000000000523000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-164.phpt b/tests/bson-corpus/decimal128-3-valid-164.phpt index 6a1789fb9..d30b9b241 100644 --- a/tests/bson-corpus/decimal128-3-valid-164.phpt +++ b/tests/bson-corpus/decimal128-3-valid-164.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400D2040000000000000000000000003A3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.234"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400d2040000000000000000000000003a3000 -18000000136400d2040000000000000000000000003a3000 -{"d":{"$numberDecimal":"1.234"}} {"d":{"$numberDecimal":"1.234"}} 18000000136400d2040000000000000000000000003a3000 -18000000136400d2040000000000000000000000003a3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-165.phpt b/tests/bson-corpus/decimal128-3-valid-165.phpt index 9898f8b84..e6c1afb3b 100644 --- a/tests/bson-corpus/decimal128-3-valid-165.phpt +++ b/tests/bson-corpus/decimal128-3-valid-165.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400F1040000000000000000000000003A3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.265"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400f1040000000000000000000000003a3000 -18000000136400f1040000000000000000000000003a3000 -{"d":{"$numberDecimal":"1.265"}} {"d":{"$numberDecimal":"1.265"}} 18000000136400f1040000000000000000000000003a3000 -18000000136400f1040000000000000000000000003a3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-166.phpt b/tests/bson-corpus/decimal128-3-valid-166.phpt index 07413a52e..f2d57028a 100644 --- a/tests/bson-corpus/decimal128-3-valid-166.phpt +++ b/tests/bson-corpus/decimal128-3-valid-166.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F1040000000000000000000000003A3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.265"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1.265E-0"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f1040000000000000000000000003a3000 -18000000136400f1040000000000000000000000003a3000 -{"d":{"$numberDecimal":"1.265"}} {"d":{"$numberDecimal":"1.265"}} 18000000136400f1040000000000000000000000003a3000 18000000136400f1040000000000000000000000003a3000 -18000000136400f1040000000000000000000000003a3000 -18000000136400f1040000000000000000000000003a3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-167.phpt b/tests/bson-corpus/decimal128-3-valid-167.phpt index f0d6e3f02..2bdeae3b3 100644 --- a/tests/bson-corpus/decimal128-3-valid-167.phpt +++ b/tests/bson-corpus/decimal128-3-valid-167.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F104000000000000000000000000383000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.1265"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1.265E-1"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f104000000000000000000000000383000 -18000000136400f104000000000000000000000000383000 -{"d":{"$numberDecimal":"0.1265"}} {"d":{"$numberDecimal":"0.1265"}} 18000000136400f104000000000000000000000000383000 18000000136400f104000000000000000000000000383000 -18000000136400f104000000000000000000000000383000 -18000000136400f104000000000000000000000000383000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-168.phpt b/tests/bson-corpus/decimal128-3-valid-168.phpt index c7339aaf4..c0ce85cd4 100644 --- a/tests/bson-corpus/decimal128-3-valid-168.phpt +++ b/tests/bson-corpus/decimal128-3-valid-168.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F1040000000000000000000000003C3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "12.65"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1.265E+1"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f1040000000000000000000000003c3000 -18000000136400f1040000000000000000000000003c3000 -{"d":{"$numberDecimal":"12.65"}} {"d":{"$numberDecimal":"12.65"}} 18000000136400f1040000000000000000000000003c3000 18000000136400f1040000000000000000000000003c3000 -18000000136400f1040000000000000000000000003c3000 -18000000136400f1040000000000000000000000003c3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-169.phpt b/tests/bson-corpus/decimal128-3-valid-169.phpt index df89db27d..31b38e926 100644 --- a/tests/bson-corpus/decimal128-3-valid-169.phpt +++ b/tests/bson-corpus/decimal128-3-valid-169.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400F104000000000000000000000000123000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.265E-20"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400f104000000000000000000000000123000 -18000000136400f104000000000000000000000000123000 -{"d":{"$numberDecimal":"1.265E-20"}} {"d":{"$numberDecimal":"1.265E-20"}} 18000000136400f104000000000000000000000000123000 -18000000136400f104000000000000000000000000123000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-170.phpt b/tests/bson-corpus/decimal128-3-valid-170.phpt index 149d77576..68961f464 100644 --- a/tests/bson-corpus/decimal128-3-valid-170.phpt +++ b/tests/bson-corpus/decimal128-3-valid-170.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400F104000000000000000000000000623000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.265E+20"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400f104000000000000000000000000623000 -18000000136400f104000000000000000000000000623000 -{"d":{"$numberDecimal":"1.265E+20"}} {"d":{"$numberDecimal":"1.265E+20"}} 18000000136400f104000000000000000000000000623000 -18000000136400f104000000000000000000000000623000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-171.phpt b/tests/bson-corpus/decimal128-3-valid-171.phpt index 9882185fa..c036071e4 100644 --- a/tests/bson-corpus/decimal128-3-valid-171.phpt +++ b/tests/bson-corpus/decimal128-3-valid-171.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F104000000000000000000000000363000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.01265"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1.265E-2"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f104000000000000000000000000363000 -18000000136400f104000000000000000000000000363000 -{"d":{"$numberDecimal":"0.01265"}} {"d":{"$numberDecimal":"0.01265"}} 18000000136400f104000000000000000000000000363000 18000000136400f104000000000000000000000000363000 -18000000136400f104000000000000000000000000363000 -18000000136400f104000000000000000000000000363000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-172.phpt b/tests/bson-corpus/decimal128-3-valid-172.phpt index 8435c5d05..0448920a0 100644 --- a/tests/bson-corpus/decimal128-3-valid-172.phpt +++ b/tests/bson-corpus/decimal128-3-valid-172.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F1040000000000000000000000003E3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "126.5"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1.265E+2"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f1040000000000000000000000003e3000 -18000000136400f1040000000000000000000000003e3000 -{"d":{"$numberDecimal":"126.5"}} {"d":{"$numberDecimal":"126.5"}} 18000000136400f1040000000000000000000000003e3000 18000000136400f1040000000000000000000000003e3000 -18000000136400f1040000000000000000000000003e3000 -18000000136400f1040000000000000000000000003e3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-173.phpt b/tests/bson-corpus/decimal128-3-valid-173.phpt index 7c6b2426d..f0f72c4e0 100644 --- a/tests/bson-corpus/decimal128-3-valid-173.phpt +++ b/tests/bson-corpus/decimal128-3-valid-173.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F104000000000000000000000000343000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.001265"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1.265E-3"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f104000000000000000000000000343000 -18000000136400f104000000000000000000000000343000 -{"d":{"$numberDecimal":"0.001265"}} {"d":{"$numberDecimal":"0.001265"}} 18000000136400f104000000000000000000000000343000 18000000136400f104000000000000000000000000343000 -18000000136400f104000000000000000000000000343000 -18000000136400f104000000000000000000000000343000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-174.phpt b/tests/bson-corpus/decimal128-3-valid-174.phpt index a0b2e3d1f..595173469 100644 --- a/tests/bson-corpus/decimal128-3-valid-174.phpt +++ b/tests/bson-corpus/decimal128-3-valid-174.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F104000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1265"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1.265E+3"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f104000000000000000000000000403000 -18000000136400f104000000000000000000000000403000 -{"d":{"$numberDecimal":"1265"}} {"d":{"$numberDecimal":"1265"}} 18000000136400f104000000000000000000000000403000 18000000136400f104000000000000000000000000403000 -18000000136400f104000000000000000000000000403000 -18000000136400f104000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-175.phpt b/tests/bson-corpus/decimal128-3-valid-175.phpt index 4075fb89f..09a86f0a2 100644 --- a/tests/bson-corpus/decimal128-3-valid-175.phpt +++ b/tests/bson-corpus/decimal128-3-valid-175.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F104000000000000000000000000323000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.0001265"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1.265E-4"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f104000000000000000000000000323000 -18000000136400f104000000000000000000000000323000 -{"d":{"$numberDecimal":"0.0001265"}} {"d":{"$numberDecimal":"0.0001265"}} 18000000136400f104000000000000000000000000323000 18000000136400f104000000000000000000000000323000 -18000000136400f104000000000000000000000000323000 -18000000136400f104000000000000000000000000323000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-176.phpt b/tests/bson-corpus/decimal128-3-valid-176.phpt index 941a6a355..4305add16 100644 --- a/tests/bson-corpus/decimal128-3-valid-176.phpt +++ b/tests/bson-corpus/decimal128-3-valid-176.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400F104000000000000000000000000423000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.265E+4"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400f104000000000000000000000000423000 -18000000136400f104000000000000000000000000423000 -{"d":{"$numberDecimal":"1.265E+4"}} {"d":{"$numberDecimal":"1.265E+4"}} 18000000136400f104000000000000000000000000423000 -18000000136400f104000000000000000000000000423000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-177.phpt b/tests/bson-corpus/decimal128-3-valid-177.phpt index 9a1d191cf..3637585b3 100644 --- a/tests/bson-corpus/decimal128-3-valid-177.phpt +++ b/tests/bson-corpus/decimal128-3-valid-177.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400F1040000000000000000000000002A3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.265E-8"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400f1040000000000000000000000002a3000 -18000000136400f1040000000000000000000000002a3000 -{"d":{"$numberDecimal":"1.265E-8"}} {"d":{"$numberDecimal":"1.265E-8"}} 18000000136400f1040000000000000000000000002a3000 -18000000136400f1040000000000000000000000002a3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-178.phpt b/tests/bson-corpus/decimal128-3-valid-178.phpt index b56a36664..62203e607 100644 --- a/tests/bson-corpus/decimal128-3-valid-178.phpt +++ b/tests/bson-corpus/decimal128-3-valid-178.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400F1040000000000000000000000004A3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.265E+8"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400f1040000000000000000000000004a3000 -18000000136400f1040000000000000000000000004a3000 -{"d":{"$numberDecimal":"1.265E+8"}} {"d":{"$numberDecimal":"1.265E+8"}} 18000000136400f1040000000000000000000000004a3000 -18000000136400f1040000000000000000000000004a3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-179.phpt b/tests/bson-corpus/decimal128-3-valid-179.phpt index d0bc531b5..bfdcdf9f5 100644 --- a/tests/bson-corpus/decimal128-3-valid-179.phpt +++ b/tests/bson-corpus/decimal128-3-valid-179.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000400000000000000000000000000523000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "4E+9"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000400000000000000000000000000523000 -180000001364000400000000000000000000000000523000 -{"d":{"$numberDecimal":"4E+9"}} {"d":{"$numberDecimal":"4E+9"}} 180000001364000400000000000000000000000000523000 -180000001364000400000000000000000000000000523000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-180.phpt b/tests/bson-corpus/decimal128-3-valid-180.phpt index 2a175aa65..57b3e3a62 100644 --- a/tests/bson-corpus/decimal128-3-valid-180.phpt +++ b/tests/bson-corpus/decimal128-3-valid-180.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000500000000000000000000000000343000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.000005"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "5E-6"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000500000000000000000000000000343000 -180000001364000500000000000000000000000000343000 -{"d":{"$numberDecimal":"0.000005"}} {"d":{"$numberDecimal":"0.000005"}} 180000001364000500000000000000000000000000343000 180000001364000500000000000000000000000000343000 -180000001364000500000000000000000000000000343000 -180000001364000500000000000000000000000000343000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-181.phpt b/tests/bson-corpus/decimal128-3-valid-181.phpt index 59f741bab..329a337aa 100644 --- a/tests/bson-corpus/decimal128-3-valid-181.phpt +++ b/tests/bson-corpus/decimal128-3-valid-181.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000500000000000000000000000000323000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "5E-7"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000500000000000000000000000000323000 -180000001364000500000000000000000000000000323000 -{"d":{"$numberDecimal":"5E-7"}} {"d":{"$numberDecimal":"5E-7"}} 180000001364000500000000000000000000000000323000 -180000001364000500000000000000000000000000323000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-182.phpt b/tests/bson-corpus/decimal128-3-valid-182.phpt index 2b9bb3a03..bb04c74b9 100644 --- a/tests/bson-corpus/decimal128-3-valid-182.phpt +++ b/tests/bson-corpus/decimal128-3-valid-182.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000700000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "7"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "7E0"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000700000000000000000000000000403000 -180000001364000700000000000000000000000000403000 -{"d":{"$numberDecimal":"7"}} {"d":{"$numberDecimal":"7"}} 180000001364000700000000000000000000000000403000 180000001364000700000000000000000000000000403000 -180000001364000700000000000000000000000000403000 -180000001364000700000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-183.phpt b/tests/bson-corpus/decimal128-3-valid-183.phpt index 776730bdc..cf3ac032b 100644 --- a/tests/bson-corpus/decimal128-3-valid-183.phpt +++ b/tests/bson-corpus/decimal128-3-valid-183.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000700000000000000000000000000543000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "7E+10"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "7E10"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000700000000000000000000000000543000 -180000001364000700000000000000000000000000543000 -{"d":{"$numberDecimal":"7E+10"}} {"d":{"$numberDecimal":"7E+10"}} 180000001364000700000000000000000000000000543000 180000001364000700000000000000000000000000543000 -180000001364000700000000000000000000000000543000 -180000001364000700000000000000000000000000543000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-184.phpt b/tests/bson-corpus/decimal128-3-valid-184.phpt index a585270c1..e5ab710fa 100644 --- a/tests/bson-corpus/decimal128-3-valid-184.phpt +++ b/tests/bson-corpus/decimal128-3-valid-184.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1800000013640007000000000000000000000000002C3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "7E-10"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1800000013640007000000000000000000000000002c3000 -1800000013640007000000000000000000000000002c3000 -{"d":{"$numberDecimal":"7E-10"}} {"d":{"$numberDecimal":"7E-10"}} 1800000013640007000000000000000000000000002c3000 -1800000013640007000000000000000000000000002c3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-185.phpt b/tests/bson-corpus/decimal128-3-valid-185.phpt index 551c2e3ea..daed87cbd 100644 --- a/tests/bson-corpus/decimal128-3-valid-185.phpt +++ b/tests/bson-corpus/decimal128-3-valid-185.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000700000000000000000000000000563000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "7E+11"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "7E11"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000700000000000000000000000000563000 -180000001364000700000000000000000000000000563000 -{"d":{"$numberDecimal":"7E+11"}} {"d":{"$numberDecimal":"7E+11"}} 180000001364000700000000000000000000000000563000 180000001364000700000000000000000000000000563000 -180000001364000700000000000000000000000000563000 -180000001364000700000000000000000000000000563000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-186.phpt b/tests/bson-corpus/decimal128-3-valid-186.phpt index 6dde8adc1..4c053e950 100644 --- a/tests/bson-corpus/decimal128-3-valid-186.phpt +++ b/tests/bson-corpus/decimal128-3-valid-186.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1800000013640007000000000000000000000000002A3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "7E-11"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1800000013640007000000000000000000000000002a3000 -1800000013640007000000000000000000000000002a3000 -{"d":{"$numberDecimal":"7E-11"}} {"d":{"$numberDecimal":"7E-11"}} 1800000013640007000000000000000000000000002a3000 -1800000013640007000000000000000000000000002a3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-187.phpt b/tests/bson-corpus/decimal128-3-valid-187.phpt index 1fe7db48a..961d10843 100644 --- a/tests/bson-corpus/decimal128-3-valid-187.phpt +++ b/tests/bson-corpus/decimal128-3-valid-187.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000700000000000000000000000000583000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "7E+12"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "7E12"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000700000000000000000000000000583000 -180000001364000700000000000000000000000000583000 -{"d":{"$numberDecimal":"7E+12"}} {"d":{"$numberDecimal":"7E+12"}} 180000001364000700000000000000000000000000583000 180000001364000700000000000000000000000000583000 -180000001364000700000000000000000000000000583000 -180000001364000700000000000000000000000000583000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-188.phpt b/tests/bson-corpus/decimal128-3-valid-188.phpt index 05d5fbcf3..69e8f224e 100644 --- a/tests/bson-corpus/decimal128-3-valid-188.phpt +++ b/tests/bson-corpus/decimal128-3-valid-188.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000700000000000000000000000000283000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "7E-12"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000700000000000000000000000000283000 -180000001364000700000000000000000000000000283000 -{"d":{"$numberDecimal":"7E-12"}} {"d":{"$numberDecimal":"7E-12"}} 180000001364000700000000000000000000000000283000 -180000001364000700000000000000000000000000283000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-189.phpt b/tests/bson-corpus/decimal128-3-valid-189.phpt index 7b1b10002..9bd9bd38a 100644 --- a/tests/bson-corpus/decimal128-3-valid-189.phpt +++ b/tests/bson-corpus/decimal128-3-valid-189.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000700000000000000000000000000263000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "7E-13"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000700000000000000000000000000263000 -180000001364000700000000000000000000000000263000 -{"d":{"$numberDecimal":"7E-13"}} {"d":{"$numberDecimal":"7E-13"}} 180000001364000700000000000000000000000000263000 -180000001364000700000000000000000000000000263000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-190.phpt b/tests/bson-corpus/decimal128-3-valid-190.phpt index eea7a8da3..06b983f63 100644 --- a/tests/bson-corpus/decimal128-3-valid-190.phpt +++ b/tests/bson-corpus/decimal128-3-valid-190.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000700000000000000000000000000423000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "7E+1"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "7E1"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000700000000000000000000000000423000 -180000001364000700000000000000000000000000423000 -{"d":{"$numberDecimal":"7E+1"}} {"d":{"$numberDecimal":"7E+1"}} 180000001364000700000000000000000000000000423000 180000001364000700000000000000000000000000423000 -180000001364000700000000000000000000000000423000 -180000001364000700000000000000000000000000423000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-191.phpt b/tests/bson-corpus/decimal128-3-valid-191.phpt index b55833d5c..11fccb33a 100644 --- a/tests/bson-corpus/decimal128-3-valid-191.phpt +++ b/tests/bson-corpus/decimal128-3-valid-191.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('1800000013640007000000000000000000000000003E3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.7"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "7E-1"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 1800000013640007000000000000000000000000003e3000 -1800000013640007000000000000000000000000003e3000 -{"d":{"$numberDecimal":"0.7"}} {"d":{"$numberDecimal":"0.7"}} 1800000013640007000000000000000000000000003e3000 1800000013640007000000000000000000000000003e3000 -1800000013640007000000000000000000000000003e3000 -1800000013640007000000000000000000000000003e3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-192.phpt b/tests/bson-corpus/decimal128-3-valid-192.phpt index 0fae55587..4ad4393b5 100644 --- a/tests/bson-corpus/decimal128-3-valid-192.phpt +++ b/tests/bson-corpus/decimal128-3-valid-192.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000700000000000000000000000000443000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "7E+2"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "7E2"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000700000000000000000000000000443000 -180000001364000700000000000000000000000000443000 -{"d":{"$numberDecimal":"7E+2"}} {"d":{"$numberDecimal":"7E+2"}} 180000001364000700000000000000000000000000443000 180000001364000700000000000000000000000000443000 -180000001364000700000000000000000000000000443000 -180000001364000700000000000000000000000000443000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-193.phpt b/tests/bson-corpus/decimal128-3-valid-193.phpt index 9d46002e6..e4df6f5f5 100644 --- a/tests/bson-corpus/decimal128-3-valid-193.phpt +++ b/tests/bson-corpus/decimal128-3-valid-193.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('1800000013640007000000000000000000000000003C3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.07"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "7E-2"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 1800000013640007000000000000000000000000003c3000 -1800000013640007000000000000000000000000003c3000 -{"d":{"$numberDecimal":"0.07"}} {"d":{"$numberDecimal":"0.07"}} 1800000013640007000000000000000000000000003c3000 1800000013640007000000000000000000000000003c3000 -1800000013640007000000000000000000000000003c3000 -1800000013640007000000000000000000000000003c3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-194.phpt b/tests/bson-corpus/decimal128-3-valid-194.phpt index e3c947fcc..a2fc57965 100644 --- a/tests/bson-corpus/decimal128-3-valid-194.phpt +++ b/tests/bson-corpus/decimal128-3-valid-194.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000700000000000000000000000000463000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "7E+3"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "7E3"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000700000000000000000000000000463000 -180000001364000700000000000000000000000000463000 -{"d":{"$numberDecimal":"7E+3"}} {"d":{"$numberDecimal":"7E+3"}} 180000001364000700000000000000000000000000463000 180000001364000700000000000000000000000000463000 -180000001364000700000000000000000000000000463000 -180000001364000700000000000000000000000000463000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-195.phpt b/tests/bson-corpus/decimal128-3-valid-195.phpt index a1a8da071..3aa9af435 100644 --- a/tests/bson-corpus/decimal128-3-valid-195.phpt +++ b/tests/bson-corpus/decimal128-3-valid-195.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('1800000013640007000000000000000000000000003A3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.007"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "7E-3"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 1800000013640007000000000000000000000000003a3000 -1800000013640007000000000000000000000000003a3000 -{"d":{"$numberDecimal":"0.007"}} {"d":{"$numberDecimal":"0.007"}} 1800000013640007000000000000000000000000003a3000 1800000013640007000000000000000000000000003a3000 -1800000013640007000000000000000000000000003a3000 -1800000013640007000000000000000000000000003a3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-196.phpt b/tests/bson-corpus/decimal128-3-valid-196.phpt index 62b446b24..7d68a9fff 100644 --- a/tests/bson-corpus/decimal128-3-valid-196.phpt +++ b/tests/bson-corpus/decimal128-3-valid-196.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000700000000000000000000000000483000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "7E+4"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "7E4"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000700000000000000000000000000483000 -180000001364000700000000000000000000000000483000 -{"d":{"$numberDecimal":"7E+4"}} {"d":{"$numberDecimal":"7E+4"}} 180000001364000700000000000000000000000000483000 180000001364000700000000000000000000000000483000 -180000001364000700000000000000000000000000483000 -180000001364000700000000000000000000000000483000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-197.phpt b/tests/bson-corpus/decimal128-3-valid-197.phpt index ad88db452..d3286de0e 100644 --- a/tests/bson-corpus/decimal128-3-valid-197.phpt +++ b/tests/bson-corpus/decimal128-3-valid-197.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000700000000000000000000000000383000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.0007"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "7E-4"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000700000000000000000000000000383000 -180000001364000700000000000000000000000000383000 -{"d":{"$numberDecimal":"0.0007"}} {"d":{"$numberDecimal":"0.0007"}} 180000001364000700000000000000000000000000383000 180000001364000700000000000000000000000000383000 -180000001364000700000000000000000000000000383000 -180000001364000700000000000000000000000000383000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-198.phpt b/tests/bson-corpus/decimal128-3-valid-198.phpt index d9c03d033..c38684888 100644 --- a/tests/bson-corpus/decimal128-3-valid-198.phpt +++ b/tests/bson-corpus/decimal128-3-valid-198.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('1800000013640007000000000000000000000000004A3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "7E+5"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "7E5"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 1800000013640007000000000000000000000000004a3000 -1800000013640007000000000000000000000000004a3000 -{"d":{"$numberDecimal":"7E+5"}} {"d":{"$numberDecimal":"7E+5"}} 1800000013640007000000000000000000000000004a3000 1800000013640007000000000000000000000000004a3000 -1800000013640007000000000000000000000000004a3000 -1800000013640007000000000000000000000000004a3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-199.phpt b/tests/bson-corpus/decimal128-3-valid-199.phpt index a2da60444..49ff76543 100644 --- a/tests/bson-corpus/decimal128-3-valid-199.phpt +++ b/tests/bson-corpus/decimal128-3-valid-199.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000700000000000000000000000000363000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.00007"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "7E-5"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000700000000000000000000000000363000 -180000001364000700000000000000000000000000363000 -{"d":{"$numberDecimal":"0.00007"}} {"d":{"$numberDecimal":"0.00007"}} 180000001364000700000000000000000000000000363000 180000001364000700000000000000000000000000363000 -180000001364000700000000000000000000000000363000 -180000001364000700000000000000000000000000363000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-200.phpt b/tests/bson-corpus/decimal128-3-valid-200.phpt index e20c79d6f..2fc87e789 100644 --- a/tests/bson-corpus/decimal128-3-valid-200.phpt +++ b/tests/bson-corpus/decimal128-3-valid-200.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('1800000013640007000000000000000000000000004C3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "7E+6"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "7E6"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 1800000013640007000000000000000000000000004c3000 -1800000013640007000000000000000000000000004c3000 -{"d":{"$numberDecimal":"7E+6"}} {"d":{"$numberDecimal":"7E+6"}} 1800000013640007000000000000000000000000004c3000 1800000013640007000000000000000000000000004c3000 -1800000013640007000000000000000000000000004c3000 -1800000013640007000000000000000000000000004c3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-201.phpt b/tests/bson-corpus/decimal128-3-valid-201.phpt index 5d7205f70..41df75cf4 100644 --- a/tests/bson-corpus/decimal128-3-valid-201.phpt +++ b/tests/bson-corpus/decimal128-3-valid-201.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000700000000000000000000000000343000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.000007"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "7E-6"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000700000000000000000000000000343000 -180000001364000700000000000000000000000000343000 -{"d":{"$numberDecimal":"0.000007"}} {"d":{"$numberDecimal":"0.000007"}} 180000001364000700000000000000000000000000343000 180000001364000700000000000000000000000000343000 -180000001364000700000000000000000000000000343000 -180000001364000700000000000000000000000000343000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-202.phpt b/tests/bson-corpus/decimal128-3-valid-202.phpt index ec36bbb15..f82b9c0db 100644 --- a/tests/bson-corpus/decimal128-3-valid-202.phpt +++ b/tests/bson-corpus/decimal128-3-valid-202.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('1800000013640007000000000000000000000000004E3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "7E+7"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "7E7"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 1800000013640007000000000000000000000000004e3000 -1800000013640007000000000000000000000000004e3000 -{"d":{"$numberDecimal":"7E+7"}} {"d":{"$numberDecimal":"7E+7"}} 1800000013640007000000000000000000000000004e3000 1800000013640007000000000000000000000000004e3000 -1800000013640007000000000000000000000000004e3000 -1800000013640007000000000000000000000000004e3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-203.phpt b/tests/bson-corpus/decimal128-3-valid-203.phpt index e79acb838..7bb110ad6 100644 --- a/tests/bson-corpus/decimal128-3-valid-203.phpt +++ b/tests/bson-corpus/decimal128-3-valid-203.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000700000000000000000000000000323000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "7E-7"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000700000000000000000000000000323000 -180000001364000700000000000000000000000000323000 -{"d":{"$numberDecimal":"7E-7"}} {"d":{"$numberDecimal":"7E-7"}} 180000001364000700000000000000000000000000323000 -180000001364000700000000000000000000000000323000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-204.phpt b/tests/bson-corpus/decimal128-3-valid-204.phpt index e17cbfdc1..3dec00a93 100644 --- a/tests/bson-corpus/decimal128-3-valid-204.phpt +++ b/tests/bson-corpus/decimal128-3-valid-204.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000700000000000000000000000000503000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "7E+8"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "7E8"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000700000000000000000000000000503000 -180000001364000700000000000000000000000000503000 -{"d":{"$numberDecimal":"7E+8"}} {"d":{"$numberDecimal":"7E+8"}} 180000001364000700000000000000000000000000503000 180000001364000700000000000000000000000000503000 -180000001364000700000000000000000000000000503000 -180000001364000700000000000000000000000000503000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-205.phpt b/tests/bson-corpus/decimal128-3-valid-205.phpt index 65fe79c67..778c75635 100644 --- a/tests/bson-corpus/decimal128-3-valid-205.phpt +++ b/tests/bson-corpus/decimal128-3-valid-205.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000700000000000000000000000000303000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "7E-8"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000700000000000000000000000000303000 -180000001364000700000000000000000000000000303000 -{"d":{"$numberDecimal":"7E-8"}} {"d":{"$numberDecimal":"7E-8"}} 180000001364000700000000000000000000000000303000 -180000001364000700000000000000000000000000303000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-206.phpt b/tests/bson-corpus/decimal128-3-valid-206.phpt index baf0de9e5..2acf7215f 100644 --- a/tests/bson-corpus/decimal128-3-valid-206.phpt +++ b/tests/bson-corpus/decimal128-3-valid-206.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000700000000000000000000000000523000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "7E+9"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "7E9"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000700000000000000000000000000523000 -180000001364000700000000000000000000000000523000 -{"d":{"$numberDecimal":"7E+9"}} {"d":{"$numberDecimal":"7E+9"}} 180000001364000700000000000000000000000000523000 180000001364000700000000000000000000000000523000 -180000001364000700000000000000000000000000523000 -180000001364000700000000000000000000000000523000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-207.phpt b/tests/bson-corpus/decimal128-3-valid-207.phpt index b9a390974..4c5398cb5 100644 --- a/tests/bson-corpus/decimal128-3-valid-207.phpt +++ b/tests/bson-corpus/decimal128-3-valid-207.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1800000013640007000000000000000000000000002E3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "7E-9"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1800000013640007000000000000000000000000002e3000 -1800000013640007000000000000000000000000002e3000 -{"d":{"$numberDecimal":"7E-9"}} {"d":{"$numberDecimal":"7E-9"}} 1800000013640007000000000000000000000000002e3000 -1800000013640007000000000000000000000000002e3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-208.phpt b/tests/bson-corpus/decimal128-3-valid-208.phpt index ad3b2669d..c62188f6e 100644 --- a/tests/bson-corpus/decimal128-3-valid-208.phpt +++ b/tests/bson-corpus/decimal128-3-valid-208.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1800000013640064000000000000000000000000003E3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "10.0"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1800000013640064000000000000000000000000003e3000 -1800000013640064000000000000000000000000003e3000 -{"d":{"$numberDecimal":"10.0"}} {"d":{"$numberDecimal":"10.0"}} 1800000013640064000000000000000000000000003e3000 -1800000013640064000000000000000000000000003e3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-209.phpt b/tests/bson-corpus/decimal128-3-valid-209.phpt index bdd881979..eadb1d31c 100644 --- a/tests/bson-corpus/decimal128-3-valid-209.phpt +++ b/tests/bson-corpus/decimal128-3-valid-209.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000A00000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "10"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000a00000000000000000000000000403000 -180000001364000a00000000000000000000000000403000 -{"d":{"$numberDecimal":"10"}} {"d":{"$numberDecimal":"10"}} 180000001364000a00000000000000000000000000403000 -180000001364000a00000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-210.phpt b/tests/bson-corpus/decimal128-3-valid-210.phpt index 30b3422e2..f18b057e2 100644 --- a/tests/bson-corpus/decimal128-3-valid-210.phpt +++ b/tests/bson-corpus/decimal128-3-valid-210.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000A00000000000000000000000000523000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.0E+10"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "10E+009"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000a00000000000000000000000000523000 -180000001364000a00000000000000000000000000523000 -{"d":{"$numberDecimal":"1.0E+10"}} {"d":{"$numberDecimal":"1.0E+10"}} 180000001364000a00000000000000000000000000523000 180000001364000a00000000000000000000000000523000 -180000001364000a00000000000000000000000000523000 -180000001364000a00000000000000000000000000523000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-211.phpt b/tests/bson-corpus/decimal128-3-valid-211.phpt index 8a7d07500..411e5caa2 100644 --- a/tests/bson-corpus/decimal128-3-valid-211.phpt +++ b/tests/bson-corpus/decimal128-3-valid-211.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000A00000000000000000000000000523000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.0E+10"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "10E+09"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000a00000000000000000000000000523000 -180000001364000a00000000000000000000000000523000 -{"d":{"$numberDecimal":"1.0E+10"}} {"d":{"$numberDecimal":"1.0E+10"}} 180000001364000a00000000000000000000000000523000 180000001364000a00000000000000000000000000523000 -180000001364000a00000000000000000000000000523000 -180000001364000a00000000000000000000000000523000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-212.phpt b/tests/bson-corpus/decimal128-3-valid-212.phpt index ddcb7c447..9ed1c29cb 100644 --- a/tests/bson-corpus/decimal128-3-valid-212.phpt +++ b/tests/bson-corpus/decimal128-3-valid-212.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000A00000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "10"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "10e0"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000a00000000000000000000000000403000 -180000001364000a00000000000000000000000000403000 -{"d":{"$numberDecimal":"10"}} {"d":{"$numberDecimal":"10"}} 180000001364000a00000000000000000000000000403000 180000001364000a00000000000000000000000000403000 -180000001364000a00000000000000000000000000403000 -180000001364000a00000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-213.phpt b/tests/bson-corpus/decimal128-3-valid-213.phpt index 4b63ec4b2..f95197c6e 100644 --- a/tests/bson-corpus/decimal128-3-valid-213.phpt +++ b/tests/bson-corpus/decimal128-3-valid-213.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000A00000000000000000000000000543000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.0E+11"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "10e10"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000a00000000000000000000000000543000 -180000001364000a00000000000000000000000000543000 -{"d":{"$numberDecimal":"1.0E+11"}} {"d":{"$numberDecimal":"1.0E+11"}} 180000001364000a00000000000000000000000000543000 180000001364000a00000000000000000000000000543000 -180000001364000a00000000000000000000000000543000 -180000001364000a00000000000000000000000000543000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-214.phpt b/tests/bson-corpus/decimal128-3-valid-214.phpt index 779f07375..b8497f677 100644 --- a/tests/bson-corpus/decimal128-3-valid-214.phpt +++ b/tests/bson-corpus/decimal128-3-valid-214.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000A000000000000000000000000002C3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.0E-9"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "10e-10"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000a000000000000000000000000002c3000 -180000001364000a000000000000000000000000002c3000 -{"d":{"$numberDecimal":"1.0E-9"}} {"d":{"$numberDecimal":"1.0E-9"}} 180000001364000a000000000000000000000000002c3000 180000001364000a000000000000000000000000002c3000 -180000001364000a000000000000000000000000002c3000 -180000001364000a000000000000000000000000002c3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-215.phpt b/tests/bson-corpus/decimal128-3-valid-215.phpt index f7495023d..2ee62f5e1 100644 --- a/tests/bson-corpus/decimal128-3-valid-215.phpt +++ b/tests/bson-corpus/decimal128-3-valid-215.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000A00000000000000000000000000563000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.0E+12"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "10e11"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000a00000000000000000000000000563000 -180000001364000a00000000000000000000000000563000 -{"d":{"$numberDecimal":"1.0E+12"}} {"d":{"$numberDecimal":"1.0E+12"}} 180000001364000a00000000000000000000000000563000 180000001364000a00000000000000000000000000563000 -180000001364000a00000000000000000000000000563000 -180000001364000a00000000000000000000000000563000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-216.phpt b/tests/bson-corpus/decimal128-3-valid-216.phpt index 8aa4fd41e..a966c6af1 100644 --- a/tests/bson-corpus/decimal128-3-valid-216.phpt +++ b/tests/bson-corpus/decimal128-3-valid-216.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000A000000000000000000000000002A3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.0E-10"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "10e-11"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000a000000000000000000000000002a3000 -180000001364000a000000000000000000000000002a3000 -{"d":{"$numberDecimal":"1.0E-10"}} {"d":{"$numberDecimal":"1.0E-10"}} 180000001364000a000000000000000000000000002a3000 180000001364000a000000000000000000000000002a3000 -180000001364000a000000000000000000000000002a3000 -180000001364000a000000000000000000000000002a3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-217.phpt b/tests/bson-corpus/decimal128-3-valid-217.phpt index 3809157d0..f01ab37b6 100644 --- a/tests/bson-corpus/decimal128-3-valid-217.phpt +++ b/tests/bson-corpus/decimal128-3-valid-217.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000A00000000000000000000000000583000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.0E+13"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "10e12"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000a00000000000000000000000000583000 -180000001364000a00000000000000000000000000583000 -{"d":{"$numberDecimal":"1.0E+13"}} {"d":{"$numberDecimal":"1.0E+13"}} 180000001364000a00000000000000000000000000583000 180000001364000a00000000000000000000000000583000 -180000001364000a00000000000000000000000000583000 -180000001364000a00000000000000000000000000583000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-218.phpt b/tests/bson-corpus/decimal128-3-valid-218.phpt index 3d16ead25..2277acb31 100644 --- a/tests/bson-corpus/decimal128-3-valid-218.phpt +++ b/tests/bson-corpus/decimal128-3-valid-218.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000A00000000000000000000000000283000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.0E-11"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "10e-12"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000a00000000000000000000000000283000 -180000001364000a00000000000000000000000000283000 -{"d":{"$numberDecimal":"1.0E-11"}} {"d":{"$numberDecimal":"1.0E-11"}} 180000001364000a00000000000000000000000000283000 180000001364000a00000000000000000000000000283000 -180000001364000a00000000000000000000000000283000 -180000001364000a00000000000000000000000000283000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-219.phpt b/tests/bson-corpus/decimal128-3-valid-219.phpt index 94210fe42..3737d21ed 100644 --- a/tests/bson-corpus/decimal128-3-valid-219.phpt +++ b/tests/bson-corpus/decimal128-3-valid-219.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000A00000000000000000000000000263000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.0E-12"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "10e-13"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000a00000000000000000000000000263000 -180000001364000a00000000000000000000000000263000 -{"d":{"$numberDecimal":"1.0E-12"}} {"d":{"$numberDecimal":"1.0E-12"}} 180000001364000a00000000000000000000000000263000 180000001364000a00000000000000000000000000263000 -180000001364000a00000000000000000000000000263000 -180000001364000a00000000000000000000000000263000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-220.phpt b/tests/bson-corpus/decimal128-3-valid-220.phpt index 66510a87d..cc09a947f 100644 --- a/tests/bson-corpus/decimal128-3-valid-220.phpt +++ b/tests/bson-corpus/decimal128-3-valid-220.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000A00000000000000000000000000423000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.0E+2"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "10e1"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000a00000000000000000000000000423000 -180000001364000a00000000000000000000000000423000 -{"d":{"$numberDecimal":"1.0E+2"}} {"d":{"$numberDecimal":"1.0E+2"}} 180000001364000a00000000000000000000000000423000 180000001364000a00000000000000000000000000423000 -180000001364000a00000000000000000000000000423000 -180000001364000a00000000000000000000000000423000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-221.phpt b/tests/bson-corpus/decimal128-3-valid-221.phpt index 68c411c47..6b4f59362 100644 --- a/tests/bson-corpus/decimal128-3-valid-221.phpt +++ b/tests/bson-corpus/decimal128-3-valid-221.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000A000000000000000000000000003E3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.0"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "10e-1"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000a000000000000000000000000003e3000 -180000001364000a000000000000000000000000003e3000 -{"d":{"$numberDecimal":"1.0"}} {"d":{"$numberDecimal":"1.0"}} 180000001364000a000000000000000000000000003e3000 180000001364000a000000000000000000000000003e3000 -180000001364000a000000000000000000000000003e3000 -180000001364000a000000000000000000000000003e3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-222.phpt b/tests/bson-corpus/decimal128-3-valid-222.phpt index cbe5e3668..e356440ab 100644 --- a/tests/bson-corpus/decimal128-3-valid-222.phpt +++ b/tests/bson-corpus/decimal128-3-valid-222.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000A00000000000000000000000000443000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.0E+3"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "10e2"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000a00000000000000000000000000443000 -180000001364000a00000000000000000000000000443000 -{"d":{"$numberDecimal":"1.0E+3"}} {"d":{"$numberDecimal":"1.0E+3"}} 180000001364000a00000000000000000000000000443000 180000001364000a00000000000000000000000000443000 -180000001364000a00000000000000000000000000443000 -180000001364000a00000000000000000000000000443000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-223.phpt b/tests/bson-corpus/decimal128-3-valid-223.phpt index 6d79fc0a7..c48f01d3f 100644 --- a/tests/bson-corpus/decimal128-3-valid-223.phpt +++ b/tests/bson-corpus/decimal128-3-valid-223.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000A000000000000000000000000003C3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.10"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "10e-2"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000a000000000000000000000000003c3000 -180000001364000a000000000000000000000000003c3000 -{"d":{"$numberDecimal":"0.10"}} {"d":{"$numberDecimal":"0.10"}} 180000001364000a000000000000000000000000003c3000 180000001364000a000000000000000000000000003c3000 -180000001364000a000000000000000000000000003c3000 -180000001364000a000000000000000000000000003c3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-224.phpt b/tests/bson-corpus/decimal128-3-valid-224.phpt index 327d3052f..5b658b35b 100644 --- a/tests/bson-corpus/decimal128-3-valid-224.phpt +++ b/tests/bson-corpus/decimal128-3-valid-224.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000A00000000000000000000000000463000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.0E+4"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "10e3"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000a00000000000000000000000000463000 -180000001364000a00000000000000000000000000463000 -{"d":{"$numberDecimal":"1.0E+4"}} {"d":{"$numberDecimal":"1.0E+4"}} 180000001364000a00000000000000000000000000463000 180000001364000a00000000000000000000000000463000 -180000001364000a00000000000000000000000000463000 -180000001364000a00000000000000000000000000463000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-225.phpt b/tests/bson-corpus/decimal128-3-valid-225.phpt index 101aaaf5f..52b88b65b 100644 --- a/tests/bson-corpus/decimal128-3-valid-225.phpt +++ b/tests/bson-corpus/decimal128-3-valid-225.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000A000000000000000000000000003A3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.010"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "10e-3"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000a000000000000000000000000003a3000 -180000001364000a000000000000000000000000003a3000 -{"d":{"$numberDecimal":"0.010"}} {"d":{"$numberDecimal":"0.010"}} 180000001364000a000000000000000000000000003a3000 180000001364000a000000000000000000000000003a3000 -180000001364000a000000000000000000000000003a3000 -180000001364000a000000000000000000000000003a3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-226.phpt b/tests/bson-corpus/decimal128-3-valid-226.phpt index 8703ee20e..93eb98a88 100644 --- a/tests/bson-corpus/decimal128-3-valid-226.phpt +++ b/tests/bson-corpus/decimal128-3-valid-226.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000A00000000000000000000000000483000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.0E+5"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "10e4"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000a00000000000000000000000000483000 -180000001364000a00000000000000000000000000483000 -{"d":{"$numberDecimal":"1.0E+5"}} {"d":{"$numberDecimal":"1.0E+5"}} 180000001364000a00000000000000000000000000483000 180000001364000a00000000000000000000000000483000 -180000001364000a00000000000000000000000000483000 -180000001364000a00000000000000000000000000483000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-227.phpt b/tests/bson-corpus/decimal128-3-valid-227.phpt index 312e7d05e..52adef595 100644 --- a/tests/bson-corpus/decimal128-3-valid-227.phpt +++ b/tests/bson-corpus/decimal128-3-valid-227.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000A00000000000000000000000000383000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.0010"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "10e-4"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000a00000000000000000000000000383000 -180000001364000a00000000000000000000000000383000 -{"d":{"$numberDecimal":"0.0010"}} {"d":{"$numberDecimal":"0.0010"}} 180000001364000a00000000000000000000000000383000 180000001364000a00000000000000000000000000383000 -180000001364000a00000000000000000000000000383000 -180000001364000a00000000000000000000000000383000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-228.phpt b/tests/bson-corpus/decimal128-3-valid-228.phpt index 1c1e50bfd..e93e403e0 100644 --- a/tests/bson-corpus/decimal128-3-valid-228.phpt +++ b/tests/bson-corpus/decimal128-3-valid-228.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000A000000000000000000000000004A3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.0E+6"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "10e5"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000a000000000000000000000000004a3000 -180000001364000a000000000000000000000000004a3000 -{"d":{"$numberDecimal":"1.0E+6"}} {"d":{"$numberDecimal":"1.0E+6"}} 180000001364000a000000000000000000000000004a3000 180000001364000a000000000000000000000000004a3000 -180000001364000a000000000000000000000000004a3000 -180000001364000a000000000000000000000000004a3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-229.phpt b/tests/bson-corpus/decimal128-3-valid-229.phpt index 91e71f87b..b63ae4ab5 100644 --- a/tests/bson-corpus/decimal128-3-valid-229.phpt +++ b/tests/bson-corpus/decimal128-3-valid-229.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000A00000000000000000000000000363000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.00010"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "10e-5"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000a00000000000000000000000000363000 -180000001364000a00000000000000000000000000363000 -{"d":{"$numberDecimal":"0.00010"}} {"d":{"$numberDecimal":"0.00010"}} 180000001364000a00000000000000000000000000363000 180000001364000a00000000000000000000000000363000 -180000001364000a00000000000000000000000000363000 -180000001364000a00000000000000000000000000363000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-230.phpt b/tests/bson-corpus/decimal128-3-valid-230.phpt index 9c5da9436..9600b28fc 100644 --- a/tests/bson-corpus/decimal128-3-valid-230.phpt +++ b/tests/bson-corpus/decimal128-3-valid-230.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000A000000000000000000000000004C3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.0E+7"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "10e6"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000a000000000000000000000000004c3000 -180000001364000a000000000000000000000000004c3000 -{"d":{"$numberDecimal":"1.0E+7"}} {"d":{"$numberDecimal":"1.0E+7"}} 180000001364000a000000000000000000000000004c3000 180000001364000a000000000000000000000000004c3000 -180000001364000a000000000000000000000000004c3000 -180000001364000a000000000000000000000000004c3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-231.phpt b/tests/bson-corpus/decimal128-3-valid-231.phpt index 86aefeb58..761b377b4 100644 --- a/tests/bson-corpus/decimal128-3-valid-231.phpt +++ b/tests/bson-corpus/decimal128-3-valid-231.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000A00000000000000000000000000343000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.000010"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "10e-6"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000a00000000000000000000000000343000 -180000001364000a00000000000000000000000000343000 -{"d":{"$numberDecimal":"0.000010"}} {"d":{"$numberDecimal":"0.000010"}} 180000001364000a00000000000000000000000000343000 180000001364000a00000000000000000000000000343000 -180000001364000a00000000000000000000000000343000 -180000001364000a00000000000000000000000000343000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-232.phpt b/tests/bson-corpus/decimal128-3-valid-232.phpt index 9e38bba03..7534e2b46 100644 --- a/tests/bson-corpus/decimal128-3-valid-232.phpt +++ b/tests/bson-corpus/decimal128-3-valid-232.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000A000000000000000000000000004E3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.0E+8"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "10e7"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000a000000000000000000000000004e3000 -180000001364000a000000000000000000000000004e3000 -{"d":{"$numberDecimal":"1.0E+8"}} {"d":{"$numberDecimal":"1.0E+8"}} 180000001364000a000000000000000000000000004e3000 180000001364000a000000000000000000000000004e3000 -180000001364000a000000000000000000000000004e3000 -180000001364000a000000000000000000000000004e3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-233.phpt b/tests/bson-corpus/decimal128-3-valid-233.phpt index d872b10d5..7c379de76 100644 --- a/tests/bson-corpus/decimal128-3-valid-233.phpt +++ b/tests/bson-corpus/decimal128-3-valid-233.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000A00000000000000000000000000323000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.0000010"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "10e-7"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000a00000000000000000000000000323000 -180000001364000a00000000000000000000000000323000 -{"d":{"$numberDecimal":"0.0000010"}} {"d":{"$numberDecimal":"0.0000010"}} 180000001364000a00000000000000000000000000323000 180000001364000a00000000000000000000000000323000 -180000001364000a00000000000000000000000000323000 -180000001364000a00000000000000000000000000323000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-234.phpt b/tests/bson-corpus/decimal128-3-valid-234.phpt index f47998ff2..ba2be78e4 100644 --- a/tests/bson-corpus/decimal128-3-valid-234.phpt +++ b/tests/bson-corpus/decimal128-3-valid-234.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000A00000000000000000000000000503000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.0E+9"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "10e8"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000a00000000000000000000000000503000 -180000001364000a00000000000000000000000000503000 -{"d":{"$numberDecimal":"1.0E+9"}} {"d":{"$numberDecimal":"1.0E+9"}} 180000001364000a00000000000000000000000000503000 180000001364000a00000000000000000000000000503000 -180000001364000a00000000000000000000000000503000 -180000001364000a00000000000000000000000000503000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-235.phpt b/tests/bson-corpus/decimal128-3-valid-235.phpt index 75d8b1c42..cc743892f 100644 --- a/tests/bson-corpus/decimal128-3-valid-235.phpt +++ b/tests/bson-corpus/decimal128-3-valid-235.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000A00000000000000000000000000303000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.0E-7"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "10e-8"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000a00000000000000000000000000303000 -180000001364000a00000000000000000000000000303000 -{"d":{"$numberDecimal":"1.0E-7"}} {"d":{"$numberDecimal":"1.0E-7"}} 180000001364000a00000000000000000000000000303000 180000001364000a00000000000000000000000000303000 -180000001364000a00000000000000000000000000303000 -180000001364000a00000000000000000000000000303000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-236.phpt b/tests/bson-corpus/decimal128-3-valid-236.phpt index eb805386f..d0fad4d96 100644 --- a/tests/bson-corpus/decimal128-3-valid-236.phpt +++ b/tests/bson-corpus/decimal128-3-valid-236.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000A00000000000000000000000000F43000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.0E+91"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "10e+90"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000a00000000000000000000000000f43000 -180000001364000a00000000000000000000000000f43000 -{"d":{"$numberDecimal":"1.0E+91"}} {"d":{"$numberDecimal":"1.0E+91"}} 180000001364000a00000000000000000000000000f43000 180000001364000a00000000000000000000000000f43000 -180000001364000a00000000000000000000000000f43000 -180000001364000a00000000000000000000000000f43000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-237.phpt b/tests/bson-corpus/decimal128-3-valid-237.phpt index 5e4002482..e7e64c914 100644 --- a/tests/bson-corpus/decimal128-3-valid-237.phpt +++ b/tests/bson-corpus/decimal128-3-valid-237.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000A00000000000000000000000000523000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.0E+10"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "10E+9"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000a00000000000000000000000000523000 -180000001364000a00000000000000000000000000523000 -{"d":{"$numberDecimal":"1.0E+10"}} {"d":{"$numberDecimal":"1.0E+10"}} 180000001364000a00000000000000000000000000523000 180000001364000a00000000000000000000000000523000 -180000001364000a00000000000000000000000000523000 -180000001364000a00000000000000000000000000523000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-238.phpt b/tests/bson-corpus/decimal128-3-valid-238.phpt index 5d8ba14aa..8a7422cc1 100644 --- a/tests/bson-corpus/decimal128-3-valid-238.phpt +++ b/tests/bson-corpus/decimal128-3-valid-238.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000A00000000000000000000000000523000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.0E+10"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "10e9"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000a00000000000000000000000000523000 -180000001364000a00000000000000000000000000523000 -{"d":{"$numberDecimal":"1.0E+10"}} {"d":{"$numberDecimal":"1.0E+10"}} 180000001364000a00000000000000000000000000523000 180000001364000a00000000000000000000000000523000 -180000001364000a00000000000000000000000000523000 -180000001364000a00000000000000000000000000523000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-239.phpt b/tests/bson-corpus/decimal128-3-valid-239.phpt index 893aebab9..0ec3d1952 100644 --- a/tests/bson-corpus/decimal128-3-valid-239.phpt +++ b/tests/bson-corpus/decimal128-3-valid-239.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000A000000000000000000000000002E3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.0E-8"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "10e-9"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000a000000000000000000000000002e3000 -180000001364000a000000000000000000000000002e3000 -{"d":{"$numberDecimal":"1.0E-8"}} {"d":{"$numberDecimal":"1.0E-8"}} 180000001364000a000000000000000000000000002e3000 180000001364000a000000000000000000000000002e3000 -180000001364000a000000000000000000000000002e3000 -180000001364000a000000000000000000000000002e3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-240.phpt b/tests/bson-corpus/decimal128-3-valid-240.phpt index cd822bd54..b39a76f66 100644 --- a/tests/bson-corpus/decimal128-3-valid-240.phpt +++ b/tests/bson-corpus/decimal128-3-valid-240.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1800000013640065000000000000000000000000003E3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "10.1"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1800000013640065000000000000000000000000003e3000 -1800000013640065000000000000000000000000003e3000 -{"d":{"$numberDecimal":"10.1"}} {"d":{"$numberDecimal":"10.1"}} 1800000013640065000000000000000000000000003e3000 -1800000013640065000000000000000000000000003e3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-241.phpt b/tests/bson-corpus/decimal128-3-valid-241.phpt index d9e1e23d5..e233a277c 100644 --- a/tests/bson-corpus/decimal128-3-valid-241.phpt +++ b/tests/bson-corpus/decimal128-3-valid-241.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1800000013640068000000000000000000000000003E3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "10.4"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1800000013640068000000000000000000000000003e3000 -1800000013640068000000000000000000000000003e3000 -{"d":{"$numberDecimal":"10.4"}} {"d":{"$numberDecimal":"10.4"}} 1800000013640068000000000000000000000000003e3000 -1800000013640068000000000000000000000000003e3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-242.phpt b/tests/bson-corpus/decimal128-3-valid-242.phpt index 7e6016999..c88a57f46 100644 --- a/tests/bson-corpus/decimal128-3-valid-242.phpt +++ b/tests/bson-corpus/decimal128-3-valid-242.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1800000013640069000000000000000000000000003E3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "10.5"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1800000013640069000000000000000000000000003e3000 -1800000013640069000000000000000000000000003e3000 -{"d":{"$numberDecimal":"10.5"}} {"d":{"$numberDecimal":"10.5"}} 1800000013640069000000000000000000000000003e3000 -1800000013640069000000000000000000000000003e3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-243.phpt b/tests/bson-corpus/decimal128-3-valid-243.phpt index ed158a2f1..a18cc7bc6 100644 --- a/tests/bson-corpus/decimal128-3-valid-243.phpt +++ b/tests/bson-corpus/decimal128-3-valid-243.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364006A000000000000000000000000003E3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "10.6"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364006a000000000000000000000000003e3000 -180000001364006a000000000000000000000000003e3000 -{"d":{"$numberDecimal":"10.6"}} {"d":{"$numberDecimal":"10.6"}} 180000001364006a000000000000000000000000003e3000 -180000001364006a000000000000000000000000003e3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-244.phpt b/tests/bson-corpus/decimal128-3-valid-244.phpt index 1386516bd..cdf4bbfe8 100644 --- a/tests/bson-corpus/decimal128-3-valid-244.phpt +++ b/tests/bson-corpus/decimal128-3-valid-244.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364006D000000000000000000000000003E3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "10.9"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364006d000000000000000000000000003e3000 -180000001364006d000000000000000000000000003e3000 -{"d":{"$numberDecimal":"10.9"}} {"d":{"$numberDecimal":"10.9"}} 180000001364006d000000000000000000000000003e3000 -180000001364006d000000000000000000000000003e3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-245.phpt b/tests/bson-corpus/decimal128-3-valid-245.phpt index bae7c43c3..f111551dd 100644 --- a/tests/bson-corpus/decimal128-3-valid-245.phpt +++ b/tests/bson-corpus/decimal128-3-valid-245.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364006E000000000000000000000000003E3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "11.0"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364006e000000000000000000000000003e3000 -180000001364006e000000000000000000000000003e3000 -{"d":{"$numberDecimal":"11.0"}} {"d":{"$numberDecimal":"11.0"}} 180000001364006e000000000000000000000000003e3000 -180000001364006e000000000000000000000000003e3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-246.phpt b/tests/bson-corpus/decimal128-3-valid-246.phpt index e3026740b..55af42f7c 100644 --- a/tests/bson-corpus/decimal128-3-valid-246.phpt +++ b/tests/bson-corpus/decimal128-3-valid-246.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000C00000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "12"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000c00000000000000000000000000403000 -180000001364000c00000000000000000000000000403000 -{"d":{"$numberDecimal":"12"}} {"d":{"$numberDecimal":"12"}} 180000001364000c00000000000000000000000000403000 -180000001364000c00000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-247.phpt b/tests/bson-corpus/decimal128-3-valid-247.phpt index 44f65e507..566de7805 100644 --- a/tests/bson-corpus/decimal128-3-valid-247.phpt +++ b/tests/bson-corpus/decimal128-3-valid-247.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400F1040000000000000000000000003C3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "12.65"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400f1040000000000000000000000003c3000 -18000000136400f1040000000000000000000000003c3000 -{"d":{"$numberDecimal":"12.65"}} {"d":{"$numberDecimal":"12.65"}} 18000000136400f1040000000000000000000000003c3000 -18000000136400f1040000000000000000000000003c3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-248.phpt b/tests/bson-corpus/decimal128-3-valid-248.phpt index bf051c3cd..932426f24 100644 --- a/tests/bson-corpus/decimal128-3-valid-248.phpt +++ b/tests/bson-corpus/decimal128-3-valid-248.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F1040000000000000000000000003C3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "12.65"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "12.65E-0"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f1040000000000000000000000003c3000 -18000000136400f1040000000000000000000000003c3000 -{"d":{"$numberDecimal":"12.65"}} {"d":{"$numberDecimal":"12.65"}} 18000000136400f1040000000000000000000000003c3000 18000000136400f1040000000000000000000000003c3000 -18000000136400f1040000000000000000000000003c3000 -18000000136400f1040000000000000000000000003c3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-249.phpt b/tests/bson-corpus/decimal128-3-valid-249.phpt index 2d49f148a..1decba049 100644 --- a/tests/bson-corpus/decimal128-3-valid-249.phpt +++ b/tests/bson-corpus/decimal128-3-valid-249.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F1040000000000000000000000003A3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.265"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "12.65E-1"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f1040000000000000000000000003a3000 -18000000136400f1040000000000000000000000003a3000 -{"d":{"$numberDecimal":"1.265"}} {"d":{"$numberDecimal":"1.265"}} 18000000136400f1040000000000000000000000003a3000 18000000136400f1040000000000000000000000003a3000 -18000000136400f1040000000000000000000000003a3000 -18000000136400f1040000000000000000000000003a3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-250.phpt b/tests/bson-corpus/decimal128-3-valid-250.phpt index 5fbeaa38e..31de75fef 100644 --- a/tests/bson-corpus/decimal128-3-valid-250.phpt +++ b/tests/bson-corpus/decimal128-3-valid-250.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F1040000000000000000000000003E3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "126.5"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "12.65E+1"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f1040000000000000000000000003e3000 -18000000136400f1040000000000000000000000003e3000 -{"d":{"$numberDecimal":"126.5"}} {"d":{"$numberDecimal":"126.5"}} 18000000136400f1040000000000000000000000003e3000 18000000136400f1040000000000000000000000003e3000 -18000000136400f1040000000000000000000000003e3000 -18000000136400f1040000000000000000000000003e3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-251.phpt b/tests/bson-corpus/decimal128-3-valid-251.phpt index 9c8b0ef21..c5537a2d1 100644 --- a/tests/bson-corpus/decimal128-3-valid-251.phpt +++ b/tests/bson-corpus/decimal128-3-valid-251.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F104000000000000000000000000143000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.265E-19"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "12.65E-20"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f104000000000000000000000000143000 -18000000136400f104000000000000000000000000143000 -{"d":{"$numberDecimal":"1.265E-19"}} {"d":{"$numberDecimal":"1.265E-19"}} 18000000136400f104000000000000000000000000143000 18000000136400f104000000000000000000000000143000 -18000000136400f104000000000000000000000000143000 -18000000136400f104000000000000000000000000143000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-252.phpt b/tests/bson-corpus/decimal128-3-valid-252.phpt index 218e8fbea..a2c2ac236 100644 --- a/tests/bson-corpus/decimal128-3-valid-252.phpt +++ b/tests/bson-corpus/decimal128-3-valid-252.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F104000000000000000000000000643000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.265E+21"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "12.65E+20"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f104000000000000000000000000643000 -18000000136400f104000000000000000000000000643000 -{"d":{"$numberDecimal":"1.265E+21"}} {"d":{"$numberDecimal":"1.265E+21"}} 18000000136400f104000000000000000000000000643000 18000000136400f104000000000000000000000000643000 -18000000136400f104000000000000000000000000643000 -18000000136400f104000000000000000000000000643000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-253.phpt b/tests/bson-corpus/decimal128-3-valid-253.phpt index 7864009ee..b7d17aaff 100644 --- a/tests/bson-corpus/decimal128-3-valid-253.phpt +++ b/tests/bson-corpus/decimal128-3-valid-253.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F104000000000000000000000000383000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.1265"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "12.65E-2"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f104000000000000000000000000383000 -18000000136400f104000000000000000000000000383000 -{"d":{"$numberDecimal":"0.1265"}} {"d":{"$numberDecimal":"0.1265"}} 18000000136400f104000000000000000000000000383000 18000000136400f104000000000000000000000000383000 -18000000136400f104000000000000000000000000383000 -18000000136400f104000000000000000000000000383000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-254.phpt b/tests/bson-corpus/decimal128-3-valid-254.phpt index 3bd74e040..7e44beb9e 100644 --- a/tests/bson-corpus/decimal128-3-valid-254.phpt +++ b/tests/bson-corpus/decimal128-3-valid-254.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F104000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1265"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "12.65E+2"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f104000000000000000000000000403000 -18000000136400f104000000000000000000000000403000 -{"d":{"$numberDecimal":"1265"}} {"d":{"$numberDecimal":"1265"}} 18000000136400f104000000000000000000000000403000 18000000136400f104000000000000000000000000403000 -18000000136400f104000000000000000000000000403000 -18000000136400f104000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-255.phpt b/tests/bson-corpus/decimal128-3-valid-255.phpt index 644526a64..a47879d67 100644 --- a/tests/bson-corpus/decimal128-3-valid-255.phpt +++ b/tests/bson-corpus/decimal128-3-valid-255.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F104000000000000000000000000363000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.01265"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "12.65E-3"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f104000000000000000000000000363000 -18000000136400f104000000000000000000000000363000 -{"d":{"$numberDecimal":"0.01265"}} {"d":{"$numberDecimal":"0.01265"}} 18000000136400f104000000000000000000000000363000 18000000136400f104000000000000000000000000363000 -18000000136400f104000000000000000000000000363000 -18000000136400f104000000000000000000000000363000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-256.phpt b/tests/bson-corpus/decimal128-3-valid-256.phpt index 005339089..474e7e600 100644 --- a/tests/bson-corpus/decimal128-3-valid-256.phpt +++ b/tests/bson-corpus/decimal128-3-valid-256.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F104000000000000000000000000423000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.265E+4"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "12.65E+3"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f104000000000000000000000000423000 -18000000136400f104000000000000000000000000423000 -{"d":{"$numberDecimal":"1.265E+4"}} {"d":{"$numberDecimal":"1.265E+4"}} 18000000136400f104000000000000000000000000423000 18000000136400f104000000000000000000000000423000 -18000000136400f104000000000000000000000000423000 -18000000136400f104000000000000000000000000423000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-257.phpt b/tests/bson-corpus/decimal128-3-valid-257.phpt index d25103645..1e1c740f7 100644 --- a/tests/bson-corpus/decimal128-3-valid-257.phpt +++ b/tests/bson-corpus/decimal128-3-valid-257.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F104000000000000000000000000343000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.001265"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "12.65E-4"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f104000000000000000000000000343000 -18000000136400f104000000000000000000000000343000 -{"d":{"$numberDecimal":"0.001265"}} {"d":{"$numberDecimal":"0.001265"}} 18000000136400f104000000000000000000000000343000 18000000136400f104000000000000000000000000343000 -18000000136400f104000000000000000000000000343000 -18000000136400f104000000000000000000000000343000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-258.phpt b/tests/bson-corpus/decimal128-3-valid-258.phpt index cc712f882..79cf868fe 100644 --- a/tests/bson-corpus/decimal128-3-valid-258.phpt +++ b/tests/bson-corpus/decimal128-3-valid-258.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F104000000000000000000000000443000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.265E+5"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "12.65E+4"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f104000000000000000000000000443000 -18000000136400f104000000000000000000000000443000 -{"d":{"$numberDecimal":"1.265E+5"}} {"d":{"$numberDecimal":"1.265E+5"}} 18000000136400f104000000000000000000000000443000 18000000136400f104000000000000000000000000443000 -18000000136400f104000000000000000000000000443000 -18000000136400f104000000000000000000000000443000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-259.phpt b/tests/bson-corpus/decimal128-3-valid-259.phpt index 7ef0d196c..94c8ba95f 100644 --- a/tests/bson-corpus/decimal128-3-valid-259.phpt +++ b/tests/bson-corpus/decimal128-3-valid-259.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F1040000000000000000000000002C3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.265E-7"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "12.65E-8"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f1040000000000000000000000002c3000 -18000000136400f1040000000000000000000000002c3000 -{"d":{"$numberDecimal":"1.265E-7"}} {"d":{"$numberDecimal":"1.265E-7"}} 18000000136400f1040000000000000000000000002c3000 18000000136400f1040000000000000000000000002c3000 -18000000136400f1040000000000000000000000002c3000 -18000000136400f1040000000000000000000000002c3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-260.phpt b/tests/bson-corpus/decimal128-3-valid-260.phpt index 0912dfd9b..b218a640e 100644 --- a/tests/bson-corpus/decimal128-3-valid-260.phpt +++ b/tests/bson-corpus/decimal128-3-valid-260.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F1040000000000000000000000004C3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.265E+9"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "12.65E+8"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f1040000000000000000000000004c3000 -18000000136400f1040000000000000000000000004c3000 -{"d":{"$numberDecimal":"1.265E+9"}} {"d":{"$numberDecimal":"1.265E+9"}} 18000000136400f1040000000000000000000000004c3000 18000000136400f1040000000000000000000000004c3000 -18000000136400f1040000000000000000000000004c3000 -18000000136400f1040000000000000000000000004c3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-261.phpt b/tests/bson-corpus/decimal128-3-valid-261.phpt index 8dd72b548..002cd1105 100644 --- a/tests/bson-corpus/decimal128-3-valid-261.phpt +++ b/tests/bson-corpus/decimal128-3-valid-261.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400FC040000000000000000000000003C3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "12.76"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "012.76"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400fc040000000000000000000000003c3000 -18000000136400fc040000000000000000000000003c3000 -{"d":{"$numberDecimal":"12.76"}} {"d":{"$numberDecimal":"12.76"}} 18000000136400fc040000000000000000000000003c3000 18000000136400fc040000000000000000000000003c3000 -18000000136400fc040000000000000000000000003c3000 -18000000136400fc040000000000000000000000003c3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-262.phpt b/tests/bson-corpus/decimal128-3-valid-262.phpt index 842ca8135..d343bb96a 100644 --- a/tests/bson-corpus/decimal128-3-valid-262.phpt +++ b/tests/bson-corpus/decimal128-3-valid-262.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400FC040000000000000000000000003C3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "12.76"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400fc040000000000000000000000003c3000 -18000000136400fc040000000000000000000000003c3000 -{"d":{"$numberDecimal":"12.76"}} {"d":{"$numberDecimal":"12.76"}} 18000000136400fc040000000000000000000000003c3000 -18000000136400fc040000000000000000000000003c3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-263.phpt b/tests/bson-corpus/decimal128-3-valid-263.phpt index 8ce74463b..86eb0ec15 100644 --- a/tests/bson-corpus/decimal128-3-valid-263.phpt +++ b/tests/bson-corpus/decimal128-3-valid-263.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364001100000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "17"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "17."}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364001100000000000000000000000000403000 -180000001364001100000000000000000000000000403000 -{"d":{"$numberDecimal":"17"}} {"d":{"$numberDecimal":"17"}} 180000001364001100000000000000000000000000403000 180000001364001100000000000000000000000000403000 -180000001364001100000000000000000000000000403000 -180000001364001100000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-264.phpt b/tests/bson-corpus/decimal128-3-valid-264.phpt index 03d239461..0217f7285 100644 --- a/tests/bson-corpus/decimal128-3-valid-264.phpt +++ b/tests/bson-corpus/decimal128-3-valid-264.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364002C00000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "44"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0044"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364002c00000000000000000000000000403000 -180000001364002c00000000000000000000000000403000 -{"d":{"$numberDecimal":"44"}} {"d":{"$numberDecimal":"44"}} 180000001364002c00000000000000000000000000403000 180000001364002c00000000000000000000000000403000 -180000001364002c00000000000000000000000000403000 -180000001364002c00000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-265.phpt b/tests/bson-corpus/decimal128-3-valid-265.phpt index 5d1972347..c33b86ba7 100644 --- a/tests/bson-corpus/decimal128-3-valid-265.phpt +++ b/tests/bson-corpus/decimal128-3-valid-265.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364002C00000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "44"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "044"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364002c00000000000000000000000000403000 -180000001364002c00000000000000000000000000403000 -{"d":{"$numberDecimal":"44"}} {"d":{"$numberDecimal":"44"}} 180000001364002c00000000000000000000000000403000 180000001364002c00000000000000000000000000403000 -180000001364002c00000000000000000000000000403000 -180000001364002c00000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-266.phpt b/tests/bson-corpus/decimal128-3-valid-266.phpt index c7182bfeb..7227313da 100644 --- a/tests/bson-corpus/decimal128-3-valid-266.phpt +++ b/tests/bson-corpus/decimal128-3-valid-266.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364002C00000000000000000000000000523000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "4.4E+10"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "44E+9"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364002c00000000000000000000000000523000 -180000001364002c00000000000000000000000000523000 -{"d":{"$numberDecimal":"4.4E+10"}} {"d":{"$numberDecimal":"4.4E+10"}} 180000001364002c00000000000000000000000000523000 180000001364002c00000000000000000000000000523000 -180000001364002c00000000000000000000000000523000 -180000001364002c00000000000000000000000000523000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-267.phpt b/tests/bson-corpus/decimal128-3-valid-267.phpt index c9ba24ad6..d14d399e7 100644 --- a/tests/bson-corpus/decimal128-3-valid-267.phpt +++ b/tests/bson-corpus/decimal128-3-valid-267.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364003200000000000000000000000000323000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.0000050"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "50E-7"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364003200000000000000000000000000323000 -180000001364003200000000000000000000000000323000 -{"d":{"$numberDecimal":"0.0000050"}} {"d":{"$numberDecimal":"0.0000050"}} 180000001364003200000000000000000000000000323000 180000001364003200000000000000000000000000323000 -180000001364003200000000000000000000000000323000 -180000001364003200000000000000000000000000323000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-268.phpt b/tests/bson-corpus/decimal128-3-valid-268.phpt index 030cde28a..f7db20d4c 100644 --- a/tests/bson-corpus/decimal128-3-valid-268.phpt +++ b/tests/bson-corpus/decimal128-3-valid-268.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364006400000000000000000000000000523000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.00E+11"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "100e+009"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364006400000000000000000000000000523000 -180000001364006400000000000000000000000000523000 -{"d":{"$numberDecimal":"1.00E+11"}} {"d":{"$numberDecimal":"1.00E+11"}} 180000001364006400000000000000000000000000523000 180000001364006400000000000000000000000000523000 -180000001364006400000000000000000000000000523000 -180000001364006400000000000000000000000000523000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-269.phpt b/tests/bson-corpus/decimal128-3-valid-269.phpt index b518a0c8b..af33ee372 100644 --- a/tests/bson-corpus/decimal128-3-valid-269.phpt +++ b/tests/bson-corpus/decimal128-3-valid-269.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364006400000000000000000000000000523000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.00E+11"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "100e+09"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364006400000000000000000000000000523000 -180000001364006400000000000000000000000000523000 -{"d":{"$numberDecimal":"1.00E+11"}} {"d":{"$numberDecimal":"1.00E+11"}} 180000001364006400000000000000000000000000523000 180000001364006400000000000000000000000000523000 -180000001364006400000000000000000000000000523000 -180000001364006400000000000000000000000000523000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-270.phpt b/tests/bson-corpus/decimal128-3-valid-270.phpt index af7be13f6..2d4b8125a 100644 --- a/tests/bson-corpus/decimal128-3-valid-270.phpt +++ b/tests/bson-corpus/decimal128-3-valid-270.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364006400000000000000000000000000F43000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.00E+92"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "100E+90"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364006400000000000000000000000000f43000 -180000001364006400000000000000000000000000f43000 -{"d":{"$numberDecimal":"1.00E+92"}} {"d":{"$numberDecimal":"1.00E+92"}} 180000001364006400000000000000000000000000f43000 180000001364006400000000000000000000000000f43000 -180000001364006400000000000000000000000000f43000 -180000001364006400000000000000000000000000f43000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-271.phpt b/tests/bson-corpus/decimal128-3-valid-271.phpt index b945cf9ef..41a4bc22d 100644 --- a/tests/bson-corpus/decimal128-3-valid-271.phpt +++ b/tests/bson-corpus/decimal128-3-valid-271.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364006400000000000000000000000000523000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.00E+11"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "100e+9"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364006400000000000000000000000000523000 -180000001364006400000000000000000000000000523000 -{"d":{"$numberDecimal":"1.00E+11"}} {"d":{"$numberDecimal":"1.00E+11"}} 180000001364006400000000000000000000000000523000 180000001364006400000000000000000000000000523000 -180000001364006400000000000000000000000000523000 -180000001364006400000000000000000000000000523000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-272.phpt b/tests/bson-corpus/decimal128-3-valid-272.phpt index a4c058ad9..001378c16 100644 --- a/tests/bson-corpus/decimal128-3-valid-272.phpt +++ b/tests/bson-corpus/decimal128-3-valid-272.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400F1040000000000000000000000003E3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "126.5"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400f1040000000000000000000000003e3000 -18000000136400f1040000000000000000000000003e3000 -{"d":{"$numberDecimal":"126.5"}} {"d":{"$numberDecimal":"126.5"}} 18000000136400f1040000000000000000000000003e3000 -18000000136400f1040000000000000000000000003e3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-273.phpt b/tests/bson-corpus/decimal128-3-valid-273.phpt index 057eb350c..c433b45e0 100644 --- a/tests/bson-corpus/decimal128-3-valid-273.phpt +++ b/tests/bson-corpus/decimal128-3-valid-273.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F1040000000000000000000000003E3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "126.5"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "126.5E-0"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f1040000000000000000000000003e3000 -18000000136400f1040000000000000000000000003e3000 -{"d":{"$numberDecimal":"126.5"}} {"d":{"$numberDecimal":"126.5"}} 18000000136400f1040000000000000000000000003e3000 18000000136400f1040000000000000000000000003e3000 -18000000136400f1040000000000000000000000003e3000 -18000000136400f1040000000000000000000000003e3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-274.phpt b/tests/bson-corpus/decimal128-3-valid-274.phpt index 514ea3258..46f58325a 100644 --- a/tests/bson-corpus/decimal128-3-valid-274.phpt +++ b/tests/bson-corpus/decimal128-3-valid-274.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F1040000000000000000000000003C3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "12.65"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "126.5E-1"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f1040000000000000000000000003c3000 -18000000136400f1040000000000000000000000003c3000 -{"d":{"$numberDecimal":"12.65"}} {"d":{"$numberDecimal":"12.65"}} 18000000136400f1040000000000000000000000003c3000 18000000136400f1040000000000000000000000003c3000 -18000000136400f1040000000000000000000000003c3000 -18000000136400f1040000000000000000000000003c3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-275.phpt b/tests/bson-corpus/decimal128-3-valid-275.phpt index 2759a54e2..fef3f9c5c 100644 --- a/tests/bson-corpus/decimal128-3-valid-275.phpt +++ b/tests/bson-corpus/decimal128-3-valid-275.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F104000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1265"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "126.5E+1"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f104000000000000000000000000403000 -18000000136400f104000000000000000000000000403000 -{"d":{"$numberDecimal":"1265"}} {"d":{"$numberDecimal":"1265"}} 18000000136400f104000000000000000000000000403000 18000000136400f104000000000000000000000000403000 -18000000136400f104000000000000000000000000403000 -18000000136400f104000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-276.phpt b/tests/bson-corpus/decimal128-3-valid-276.phpt index 85797123d..2bd48fcc9 100644 --- a/tests/bson-corpus/decimal128-3-valid-276.phpt +++ b/tests/bson-corpus/decimal128-3-valid-276.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F104000000000000000000000000163000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.265E-18"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "126.5E-20"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f104000000000000000000000000163000 -18000000136400f104000000000000000000000000163000 -{"d":{"$numberDecimal":"1.265E-18"}} {"d":{"$numberDecimal":"1.265E-18"}} 18000000136400f104000000000000000000000000163000 18000000136400f104000000000000000000000000163000 -18000000136400f104000000000000000000000000163000 -18000000136400f104000000000000000000000000163000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-277.phpt b/tests/bson-corpus/decimal128-3-valid-277.phpt index f7baabbf7..33ef74a80 100644 --- a/tests/bson-corpus/decimal128-3-valid-277.phpt +++ b/tests/bson-corpus/decimal128-3-valid-277.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F104000000000000000000000000663000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.265E+22"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "126.5E+20"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f104000000000000000000000000663000 -18000000136400f104000000000000000000000000663000 -{"d":{"$numberDecimal":"1.265E+22"}} {"d":{"$numberDecimal":"1.265E+22"}} 18000000136400f104000000000000000000000000663000 18000000136400f104000000000000000000000000663000 -18000000136400f104000000000000000000000000663000 -18000000136400f104000000000000000000000000663000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-278.phpt b/tests/bson-corpus/decimal128-3-valid-278.phpt index 83c6ffd1b..d1b67068e 100644 --- a/tests/bson-corpus/decimal128-3-valid-278.phpt +++ b/tests/bson-corpus/decimal128-3-valid-278.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F1040000000000000000000000003A3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.265"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "126.5E-2"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f1040000000000000000000000003a3000 -18000000136400f1040000000000000000000000003a3000 -{"d":{"$numberDecimal":"1.265"}} {"d":{"$numberDecimal":"1.265"}} 18000000136400f1040000000000000000000000003a3000 18000000136400f1040000000000000000000000003a3000 -18000000136400f1040000000000000000000000003a3000 -18000000136400f1040000000000000000000000003a3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-279.phpt b/tests/bson-corpus/decimal128-3-valid-279.phpt index 6271e85c2..669dccf22 100644 --- a/tests/bson-corpus/decimal128-3-valid-279.phpt +++ b/tests/bson-corpus/decimal128-3-valid-279.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F104000000000000000000000000423000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.265E+4"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "126.5E+2"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f104000000000000000000000000423000 -18000000136400f104000000000000000000000000423000 -{"d":{"$numberDecimal":"1.265E+4"}} {"d":{"$numberDecimal":"1.265E+4"}} 18000000136400f104000000000000000000000000423000 18000000136400f104000000000000000000000000423000 -18000000136400f104000000000000000000000000423000 -18000000136400f104000000000000000000000000423000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-280.phpt b/tests/bson-corpus/decimal128-3-valid-280.phpt index 624a88cdd..c54895a18 100644 --- a/tests/bson-corpus/decimal128-3-valid-280.phpt +++ b/tests/bson-corpus/decimal128-3-valid-280.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F104000000000000000000000000383000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.1265"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "126.5E-3"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f104000000000000000000000000383000 -18000000136400f104000000000000000000000000383000 -{"d":{"$numberDecimal":"0.1265"}} {"d":{"$numberDecimal":"0.1265"}} 18000000136400f104000000000000000000000000383000 18000000136400f104000000000000000000000000383000 -18000000136400f104000000000000000000000000383000 -18000000136400f104000000000000000000000000383000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-281.phpt b/tests/bson-corpus/decimal128-3-valid-281.phpt index c02b03d9b..40294dfec 100644 --- a/tests/bson-corpus/decimal128-3-valid-281.phpt +++ b/tests/bson-corpus/decimal128-3-valid-281.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F104000000000000000000000000443000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.265E+5"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "126.5E+3"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f104000000000000000000000000443000 -18000000136400f104000000000000000000000000443000 -{"d":{"$numberDecimal":"1.265E+5"}} {"d":{"$numberDecimal":"1.265E+5"}} 18000000136400f104000000000000000000000000443000 18000000136400f104000000000000000000000000443000 -18000000136400f104000000000000000000000000443000 -18000000136400f104000000000000000000000000443000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-282.phpt b/tests/bson-corpus/decimal128-3-valid-282.phpt index 2d2402f9e..da38eb506 100644 --- a/tests/bson-corpus/decimal128-3-valid-282.phpt +++ b/tests/bson-corpus/decimal128-3-valid-282.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F104000000000000000000000000363000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.01265"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "126.5E-4"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f104000000000000000000000000363000 -18000000136400f104000000000000000000000000363000 -{"d":{"$numberDecimal":"0.01265"}} {"d":{"$numberDecimal":"0.01265"}} 18000000136400f104000000000000000000000000363000 18000000136400f104000000000000000000000000363000 -18000000136400f104000000000000000000000000363000 -18000000136400f104000000000000000000000000363000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-283.phpt b/tests/bson-corpus/decimal128-3-valid-283.phpt index 197422041..a38120184 100644 --- a/tests/bson-corpus/decimal128-3-valid-283.phpt +++ b/tests/bson-corpus/decimal128-3-valid-283.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F104000000000000000000000000463000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.265E+6"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "126.5E+4"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f104000000000000000000000000463000 -18000000136400f104000000000000000000000000463000 -{"d":{"$numberDecimal":"1.265E+6"}} {"d":{"$numberDecimal":"1.265E+6"}} 18000000136400f104000000000000000000000000463000 18000000136400f104000000000000000000000000463000 -18000000136400f104000000000000000000000000463000 -18000000136400f104000000000000000000000000463000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-284.phpt b/tests/bson-corpus/decimal128-3-valid-284.phpt index cf376179d..8fde46c8e 100644 --- a/tests/bson-corpus/decimal128-3-valid-284.phpt +++ b/tests/bson-corpus/decimal128-3-valid-284.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F1040000000000000000000000002E3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.000001265"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "126.5E-8"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f1040000000000000000000000002e3000 -18000000136400f1040000000000000000000000002e3000 -{"d":{"$numberDecimal":"0.000001265"}} {"d":{"$numberDecimal":"0.000001265"}} 18000000136400f1040000000000000000000000002e3000 18000000136400f1040000000000000000000000002e3000 -18000000136400f1040000000000000000000000002e3000 -18000000136400f1040000000000000000000000002e3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-285.phpt b/tests/bson-corpus/decimal128-3-valid-285.phpt index 3ea0fcc52..4901219b9 100644 --- a/tests/bson-corpus/decimal128-3-valid-285.phpt +++ b/tests/bson-corpus/decimal128-3-valid-285.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F1040000000000000000000000004E3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.265E+10"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "126.5E+8"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f1040000000000000000000000004e3000 -18000000136400f1040000000000000000000000004e3000 -{"d":{"$numberDecimal":"1.265E+10"}} {"d":{"$numberDecimal":"1.265E+10"}} 18000000136400f1040000000000000000000000004e3000 18000000136400f1040000000000000000000000004e3000 -18000000136400f1040000000000000000000000004e3000 -18000000136400f1040000000000000000000000004e3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-286.phpt b/tests/bson-corpus/decimal128-3-valid-286.phpt index 58627088e..c5018244c 100644 --- a/tests/bson-corpus/decimal128-3-valid-286.phpt +++ b/tests/bson-corpus/decimal128-3-valid-286.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400E803000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1000"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400e803000000000000000000000000403000 -18000000136400e803000000000000000000000000403000 -{"d":{"$numberDecimal":"1000"}} {"d":{"$numberDecimal":"1000"}} 18000000136400e803000000000000000000000000403000 -18000000136400e803000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-287.phpt b/tests/bson-corpus/decimal128-3-valid-287.phpt index 303cd2e9d..55cdd40ab 100644 --- a/tests/bson-corpus/decimal128-3-valid-287.phpt +++ b/tests/bson-corpus/decimal128-3-valid-287.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400F104000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1265"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400f104000000000000000000000000403000 -18000000136400f104000000000000000000000000403000 -{"d":{"$numberDecimal":"1265"}} {"d":{"$numberDecimal":"1265"}} 18000000136400f104000000000000000000000000403000 -18000000136400f104000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-288.phpt b/tests/bson-corpus/decimal128-3-valid-288.phpt index 6cfa5f531..f22e205d9 100644 --- a/tests/bson-corpus/decimal128-3-valid-288.phpt +++ b/tests/bson-corpus/decimal128-3-valid-288.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F104000000000000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1265"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1265E-0"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f104000000000000000000000000403000 -18000000136400f104000000000000000000000000403000 -{"d":{"$numberDecimal":"1265"}} {"d":{"$numberDecimal":"1265"}} 18000000136400f104000000000000000000000000403000 18000000136400f104000000000000000000000000403000 -18000000136400f104000000000000000000000000403000 -18000000136400f104000000000000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-289.phpt b/tests/bson-corpus/decimal128-3-valid-289.phpt index 3a7cb1441..c5baa0c85 100644 --- a/tests/bson-corpus/decimal128-3-valid-289.phpt +++ b/tests/bson-corpus/decimal128-3-valid-289.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F1040000000000000000000000003E3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "126.5"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1265E-1"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f1040000000000000000000000003e3000 -18000000136400f1040000000000000000000000003e3000 -{"d":{"$numberDecimal":"126.5"}} {"d":{"$numberDecimal":"126.5"}} 18000000136400f1040000000000000000000000003e3000 18000000136400f1040000000000000000000000003e3000 -18000000136400f1040000000000000000000000003e3000 -18000000136400f1040000000000000000000000003e3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-290.phpt b/tests/bson-corpus/decimal128-3-valid-290.phpt index 5fa881e2f..e143565d7 100644 --- a/tests/bson-corpus/decimal128-3-valid-290.phpt +++ b/tests/bson-corpus/decimal128-3-valid-290.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F104000000000000000000000000423000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.265E+4"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1265E+1"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f104000000000000000000000000423000 -18000000136400f104000000000000000000000000423000 -{"d":{"$numberDecimal":"1.265E+4"}} {"d":{"$numberDecimal":"1.265E+4"}} 18000000136400f104000000000000000000000000423000 18000000136400f104000000000000000000000000423000 -18000000136400f104000000000000000000000000423000 -18000000136400f104000000000000000000000000423000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-291.phpt b/tests/bson-corpus/decimal128-3-valid-291.phpt index 84c9b9224..25c9b0fd5 100644 --- a/tests/bson-corpus/decimal128-3-valid-291.phpt +++ b/tests/bson-corpus/decimal128-3-valid-291.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F104000000000000000000000000183000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.265E-17"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1265E-20"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f104000000000000000000000000183000 -18000000136400f104000000000000000000000000183000 -{"d":{"$numberDecimal":"1.265E-17"}} {"d":{"$numberDecimal":"1.265E-17"}} 18000000136400f104000000000000000000000000183000 18000000136400f104000000000000000000000000183000 -18000000136400f104000000000000000000000000183000 -18000000136400f104000000000000000000000000183000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-292.phpt b/tests/bson-corpus/decimal128-3-valid-292.phpt index 1e0168e89..6818f7bf5 100644 --- a/tests/bson-corpus/decimal128-3-valid-292.phpt +++ b/tests/bson-corpus/decimal128-3-valid-292.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F104000000000000000000000000683000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.265E+23"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1265E+20"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f104000000000000000000000000683000 -18000000136400f104000000000000000000000000683000 -{"d":{"$numberDecimal":"1.265E+23"}} {"d":{"$numberDecimal":"1.265E+23"}} 18000000136400f104000000000000000000000000683000 18000000136400f104000000000000000000000000683000 -18000000136400f104000000000000000000000000683000 -18000000136400f104000000000000000000000000683000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-293.phpt b/tests/bson-corpus/decimal128-3-valid-293.phpt index c65b3bec5..87f76adbd 100644 --- a/tests/bson-corpus/decimal128-3-valid-293.phpt +++ b/tests/bson-corpus/decimal128-3-valid-293.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F1040000000000000000000000003C3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "12.65"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1265E-2"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f1040000000000000000000000003c3000 -18000000136400f1040000000000000000000000003c3000 -{"d":{"$numberDecimal":"12.65"}} {"d":{"$numberDecimal":"12.65"}} 18000000136400f1040000000000000000000000003c3000 18000000136400f1040000000000000000000000003c3000 -18000000136400f1040000000000000000000000003c3000 -18000000136400f1040000000000000000000000003c3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-294.phpt b/tests/bson-corpus/decimal128-3-valid-294.phpt index 85b706838..82f85e1c6 100644 --- a/tests/bson-corpus/decimal128-3-valid-294.phpt +++ b/tests/bson-corpus/decimal128-3-valid-294.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F104000000000000000000000000443000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.265E+5"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1265E+2"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f104000000000000000000000000443000 -18000000136400f104000000000000000000000000443000 -{"d":{"$numberDecimal":"1.265E+5"}} {"d":{"$numberDecimal":"1.265E+5"}} 18000000136400f104000000000000000000000000443000 18000000136400f104000000000000000000000000443000 -18000000136400f104000000000000000000000000443000 -18000000136400f104000000000000000000000000443000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-295.phpt b/tests/bson-corpus/decimal128-3-valid-295.phpt index a95d6f8d2..6e3f411d5 100644 --- a/tests/bson-corpus/decimal128-3-valid-295.phpt +++ b/tests/bson-corpus/decimal128-3-valid-295.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F1040000000000000000000000003A3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.265"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1265E-3"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f1040000000000000000000000003a3000 -18000000136400f1040000000000000000000000003a3000 -{"d":{"$numberDecimal":"1.265"}} {"d":{"$numberDecimal":"1.265"}} 18000000136400f1040000000000000000000000003a3000 18000000136400f1040000000000000000000000003a3000 -18000000136400f1040000000000000000000000003a3000 -18000000136400f1040000000000000000000000003a3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-296.phpt b/tests/bson-corpus/decimal128-3-valid-296.phpt index f9f0f2788..c9fca0c34 100644 --- a/tests/bson-corpus/decimal128-3-valid-296.phpt +++ b/tests/bson-corpus/decimal128-3-valid-296.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F104000000000000000000000000463000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.265E+6"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1265E+3"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f104000000000000000000000000463000 -18000000136400f104000000000000000000000000463000 -{"d":{"$numberDecimal":"1.265E+6"}} {"d":{"$numberDecimal":"1.265E+6"}} 18000000136400f104000000000000000000000000463000 18000000136400f104000000000000000000000000463000 -18000000136400f104000000000000000000000000463000 -18000000136400f104000000000000000000000000463000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-297.phpt b/tests/bson-corpus/decimal128-3-valid-297.phpt index 7fc57dd83..7e438f465 100644 --- a/tests/bson-corpus/decimal128-3-valid-297.phpt +++ b/tests/bson-corpus/decimal128-3-valid-297.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F104000000000000000000000000383000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.1265"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1265E-4"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f104000000000000000000000000383000 -18000000136400f104000000000000000000000000383000 -{"d":{"$numberDecimal":"0.1265"}} {"d":{"$numberDecimal":"0.1265"}} 18000000136400f104000000000000000000000000383000 18000000136400f104000000000000000000000000383000 -18000000136400f104000000000000000000000000383000 -18000000136400f104000000000000000000000000383000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-298.phpt b/tests/bson-corpus/decimal128-3-valid-298.phpt index d3035668f..aa5258929 100644 --- a/tests/bson-corpus/decimal128-3-valid-298.phpt +++ b/tests/bson-corpus/decimal128-3-valid-298.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F104000000000000000000000000483000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.265E+7"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1265E+4"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f104000000000000000000000000483000 -18000000136400f104000000000000000000000000483000 -{"d":{"$numberDecimal":"1.265E+7"}} {"d":{"$numberDecimal":"1.265E+7"}} 18000000136400f104000000000000000000000000483000 18000000136400f104000000000000000000000000483000 -18000000136400f104000000000000000000000000483000 -18000000136400f104000000000000000000000000483000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-299.phpt b/tests/bson-corpus/decimal128-3-valid-299.phpt index a5ec5a2ee..ce7515948 100644 --- a/tests/bson-corpus/decimal128-3-valid-299.phpt +++ b/tests/bson-corpus/decimal128-3-valid-299.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F104000000000000000000000000303000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.00001265"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1265E-8"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f104000000000000000000000000303000 -18000000136400f104000000000000000000000000303000 -{"d":{"$numberDecimal":"0.00001265"}} {"d":{"$numberDecimal":"0.00001265"}} 18000000136400f104000000000000000000000000303000 18000000136400f104000000000000000000000000303000 -18000000136400f104000000000000000000000000303000 -18000000136400f104000000000000000000000000303000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-300.phpt b/tests/bson-corpus/decimal128-3-valid-300.phpt index 5001dd89a..22bba1137 100644 --- a/tests/bson-corpus/decimal128-3-valid-300.phpt +++ b/tests/bson-corpus/decimal128-3-valid-300.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F104000000000000000000000000503000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.265E+11"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1265E+8"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f104000000000000000000000000503000 -18000000136400f104000000000000000000000000503000 -{"d":{"$numberDecimal":"1.265E+11"}} {"d":{"$numberDecimal":"1.265E+11"}} 18000000136400f104000000000000000000000000503000 18000000136400f104000000000000000000000000503000 -18000000136400f104000000000000000000000000503000 -18000000136400f104000000000000000000000000503000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-301.phpt b/tests/bson-corpus/decimal128-3-valid-301.phpt index 50d480e52..71546356a 100644 --- a/tests/bson-corpus/decimal128-3-valid-301.phpt +++ b/tests/bson-corpus/decimal128-3-valid-301.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('18000000136400185C0ACE00000000000000000000383000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "345678.5432"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 18000000136400185c0ace00000000000000000000383000 -18000000136400185c0ace00000000000000000000383000 -{"d":{"$numberDecimal":"345678.5432"}} {"d":{"$numberDecimal":"345678.5432"}} 18000000136400185c0ace00000000000000000000383000 -18000000136400185c0ace00000000000000000000383000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-302.phpt b/tests/bson-corpus/decimal128-3-valid-302.phpt index a0da67dcd..808d3e89d 100644 --- a/tests/bson-corpus/decimal128-3-valid-302.phpt +++ b/tests/bson-corpus/decimal128-3-valid-302.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400F198670C08000000000000000000363000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "345678.54321"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0345678.54321"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400f198670c08000000000000000000363000 -18000000136400f198670c08000000000000000000363000 -{"d":{"$numberDecimal":"345678.54321"}} {"d":{"$numberDecimal":"345678.54321"}} 18000000136400f198670c08000000000000000000363000 18000000136400f198670c08000000000000000000363000 -18000000136400f198670c08000000000000000000363000 -18000000136400f198670c08000000000000000000363000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-303.phpt b/tests/bson-corpus/decimal128-3-valid-303.phpt index 614d14e04..3ca3e1bfc 100644 --- a/tests/bson-corpus/decimal128-3-valid-303.phpt +++ b/tests/bson-corpus/decimal128-3-valid-303.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364006AF90B7C50000000000000000000343000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "345678.543210"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364006af90b7c50000000000000000000343000 -180000001364006af90b7c50000000000000000000343000 -{"d":{"$numberDecimal":"345678.543210"}} {"d":{"$numberDecimal":"345678.543210"}} 180000001364006af90b7c50000000000000000000343000 -180000001364006af90b7c50000000000000000000343000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-304.phpt b/tests/bson-corpus/decimal128-3-valid-304.phpt index 35ef9f200..08737f237 100644 --- a/tests/bson-corpus/decimal128-3-valid-304.phpt +++ b/tests/bson-corpus/decimal128-3-valid-304.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364006A19562522020000000000000000343000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "2345678.543210"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364006a19562522020000000000000000343000 -180000001364006a19562522020000000000000000343000 -{"d":{"$numberDecimal":"2345678.543210"}} {"d":{"$numberDecimal":"2345678.543210"}} 180000001364006a19562522020000000000000000343000 -180000001364006a19562522020000000000000000343000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-305.phpt b/tests/bson-corpus/decimal128-3-valid-305.phpt index 64d5a4ff7..5ae5651f4 100644 --- a/tests/bson-corpus/decimal128-3-valid-305.phpt +++ b/tests/bson-corpus/decimal128-3-valid-305.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364006AB9C8733A0B0000000000000000343000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "12345678.543210"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364006ab9c8733a0b0000000000000000343000 -180000001364006ab9c8733a0b0000000000000000343000 -{"d":{"$numberDecimal":"12345678.543210"}} {"d":{"$numberDecimal":"12345678.543210"}} 180000001364006ab9c8733a0b0000000000000000343000 -180000001364006ab9c8733a0b0000000000000000343000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-306.phpt b/tests/bson-corpus/decimal128-3-valid-306.phpt index 2e53ede38..8fc7e6a79 100644 --- a/tests/bson-corpus/decimal128-3-valid-306.phpt +++ b/tests/bson-corpus/decimal128-3-valid-306.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1800000013640040AF0D8648700000000000000000343000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "123456789.000000"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1800000013640040af0d8648700000000000000000343000 -1800000013640040af0d8648700000000000000000343000 -{"d":{"$numberDecimal":"123456789.000000"}} {"d":{"$numberDecimal":"123456789.000000"}} 1800000013640040af0d8648700000000000000000343000 -1800000013640040af0d8648700000000000000000343000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-307.phpt b/tests/bson-corpus/decimal128-3-valid-307.phpt index ca1799aab..061ad440c 100644 --- a/tests/bson-corpus/decimal128-3-valid-307.phpt +++ b/tests/bson-corpus/decimal128-3-valid-307.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1800000013640080910F8648700000000000000000343000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "123456789.123456"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1800000013640080910f8648700000000000000000343000 -1800000013640080910f8648700000000000000000343000 -{"d":{"$numberDecimal":"123456789.123456"}} {"d":{"$numberDecimal":"123456789.123456"}} 1800000013640080910f8648700000000000000000343000 -1800000013640080910f8648700000000000000000343000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-3-valid-308.phpt b/tests/bson-corpus/decimal128-3-valid-308.phpt index fdd9df637..736b30492 100644 --- a/tests/bson-corpus/decimal128-3-valid-308.phpt +++ b/tests/bson-corpus/decimal128-3-valid-308.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1800000013640080910F8648700000000000000000403000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "123456789123456"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1800000013640080910f8648700000000000000000403000 -1800000013640080910f8648700000000000000000403000 -{"d":{"$numberDecimal":"123456789123456"}} {"d":{"$numberDecimal":"123456789123456"}} 1800000013640080910f8648700000000000000000403000 -1800000013640080910f8648700000000000000000403000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-4-valid-001.phpt b/tests/bson-corpus/decimal128-4-valid-001.phpt index 8f80072b0..eb18aa6fa 100644 --- a/tests/bson-corpus/decimal128-4-valid-001.phpt +++ b/tests/bson-corpus/decimal128-4-valid-001.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1800000013640001000000000000000000000000003EB000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-0.1"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1800000013640001000000000000000000000000003eb000 -1800000013640001000000000000000000000000003eb000 -{"d":{"$numberDecimal":"-0.1"}} {"d":{"$numberDecimal":"-0.1"}} 1800000013640001000000000000000000000000003eb000 -1800000013640001000000000000000000000000003eb000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-4-valid-002.phpt b/tests/bson-corpus/decimal128-4-valid-002.phpt index 11ddd1ac3..f7c3af34e 100644 --- a/tests/bson-corpus/decimal128-4-valid-002.phpt +++ b/tests/bson-corpus/decimal128-4-valid-002.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('1800000013640003000000000000000000000000003A3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.003"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "+0.003"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 1800000013640003000000000000000000000000003a3000 -1800000013640003000000000000000000000000003a3000 -{"d":{"$numberDecimal":"0.003"}} {"d":{"$numberDecimal":"0.003"}} 1800000013640003000000000000000000000000003a3000 1800000013640003000000000000000000000000003a3000 -1800000013640003000000000000000000000000003a3000 -1800000013640003000000000000000000000000003a3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-4-valid-003.phpt b/tests/bson-corpus/decimal128-4-valid-003.phpt index eda2aa4a9..38131bd5b 100644 --- a/tests/bson-corpus/decimal128-4-valid-003.phpt +++ b/tests/bson-corpus/decimal128-4-valid-003.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('1800000013640000000000000000000000000000003E3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.0"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : ".0"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 1800000013640000000000000000000000000000003e3000 -1800000013640000000000000000000000000000003e3000 -{"d":{"$numberDecimal":"0.0"}} {"d":{"$numberDecimal":"0.0"}} 1800000013640000000000000000000000000000003e3000 1800000013640000000000000000000000000000003e3000 -1800000013640000000000000000000000000000003e3000 -1800000013640000000000000000000000000000003e3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-4-valid-004.phpt b/tests/bson-corpus/decimal128-4-valid-004.phpt index 593ad0c16..5a8920ed4 100644 --- a/tests/bson-corpus/decimal128-4-valid-004.phpt +++ b/tests/bson-corpus/decimal128-4-valid-004.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('1800000013640000000000000000000000000000003EB000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-0.0"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "-.0"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 1800000013640000000000000000000000000000003eb000 -1800000013640000000000000000000000000000003eb000 -{"d":{"$numberDecimal":"-0.0"}} {"d":{"$numberDecimal":"-0.0"}} 1800000013640000000000000000000000000000003eb000 1800000013640000000000000000000000000000003eb000 -1800000013640000000000000000000000000000003eb000 -1800000013640000000000000000000000000000003eb000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-4-valid-005.phpt b/tests/bson-corpus/decimal128-4-valid-005.phpt index ea7fb5c29..771b2c77c 100644 --- a/tests/bson-corpus/decimal128-4-valid-005.phpt +++ b/tests/bson-corpus/decimal128-4-valid-005.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400FC040000000000000000000000003C3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "12.76"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "+12.76"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400fc040000000000000000000000003c3000 -18000000136400fc040000000000000000000000003c3000 -{"d":{"$numberDecimal":"12.76"}} {"d":{"$numberDecimal":"12.76"}} 18000000136400fc040000000000000000000000003c3000 18000000136400fc040000000000000000000000003c3000 -18000000136400fc040000000000000000000000003c3000 -18000000136400fc040000000000000000000000003c3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-4-valid-006.phpt b/tests/bson-corpus/decimal128-4-valid-006.phpt index ec96fb536..90ba37d62 100644 --- a/tests/bson-corpus/decimal128-4-valid-006.phpt +++ b/tests/bson-corpus/decimal128-4-valid-006.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000500000000000000000000000000303000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "5E-8"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.00000005"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000500000000000000000000000000303000 -180000001364000500000000000000000000000000303000 -{"d":{"$numberDecimal":"5E-8"}} {"d":{"$numberDecimal":"5E-8"}} 180000001364000500000000000000000000000000303000 180000001364000500000000000000000000000000303000 -180000001364000500000000000000000000000000303000 -180000001364000500000000000000000000000000303000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-4-valid-007.phpt b/tests/bson-corpus/decimal128-4-valid-007.phpt index cbfd5f8f7..a4ab92378 100644 --- a/tests/bson-corpus/decimal128-4-valid-007.phpt +++ b/tests/bson-corpus/decimal128-4-valid-007.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000500000000000000000000000000323000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "5E-7"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.0000005"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000500000000000000000000000000323000 -180000001364000500000000000000000000000000323000 -{"d":{"$numberDecimal":"5E-7"}} {"d":{"$numberDecimal":"5E-7"}} 180000001364000500000000000000000000000000323000 180000001364000500000000000000000000000000323000 -180000001364000500000000000000000000000000323000 -180000001364000500000000000000000000000000323000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-4-valid-008.phpt b/tests/bson-corpus/decimal128-4-valid-008.phpt index 2e3375fd6..376eaaac5 100644 --- a/tests/bson-corpus/decimal128-4-valid-008.phpt +++ b/tests/bson-corpus/decimal128-4-valid-008.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000500000000000000000000000000343000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.000005"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000500000000000000000000000000343000 -180000001364000500000000000000000000000000343000 -{"d":{"$numberDecimal":"0.000005"}} {"d":{"$numberDecimal":"0.000005"}} 180000001364000500000000000000000000000000343000 -180000001364000500000000000000000000000000343000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-4-valid-009.phpt b/tests/bson-corpus/decimal128-4-valid-009.phpt index cb15c3398..4dd5b5ccc 100644 --- a/tests/bson-corpus/decimal128-4-valid-009.phpt +++ b/tests/bson-corpus/decimal128-4-valid-009.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000500000000000000000000000000363000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.00005"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "00.00005"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000500000000000000000000000000363000 -180000001364000500000000000000000000000000363000 -{"d":{"$numberDecimal":"0.00005"}} {"d":{"$numberDecimal":"0.00005"}} 180000001364000500000000000000000000000000363000 180000001364000500000000000000000000000000363000 -180000001364000500000000000000000000000000363000 -180000001364000500000000000000000000000000363000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-4-valid-010.phpt b/tests/bson-corpus/decimal128-4-valid-010.phpt index d09249225..514f7fa6a 100644 --- a/tests/bson-corpus/decimal128-4-valid-010.phpt +++ b/tests/bson-corpus/decimal128-4-valid-010.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000500000000000000000000000000383000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.0005"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000500000000000000000000000000383000 -180000001364000500000000000000000000000000383000 -{"d":{"$numberDecimal":"0.0005"}} {"d":{"$numberDecimal":"0.0005"}} 180000001364000500000000000000000000000000383000 -180000001364000500000000000000000000000000383000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-4-valid-011.phpt b/tests/bson-corpus/decimal128-4-valid-011.phpt index 77f57be84..0bd33f144 100644 --- a/tests/bson-corpus/decimal128-4-valid-011.phpt +++ b/tests/bson-corpus/decimal128-4-valid-011.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('1800000013640005000000000000000000000000003E3000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.5"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : ".5"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 1800000013640005000000000000000000000000003e3000 -1800000013640005000000000000000000000000003e3000 -{"d":{"$numberDecimal":"0.5"}} {"d":{"$numberDecimal":"0.5"}} 1800000013640005000000000000000000000000003e3000 1800000013640005000000000000000000000000003e3000 -1800000013640005000000000000000000000000003e3000 -1800000013640005000000000000000000000000003e3000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-4-valid-012.phpt b/tests/bson-corpus/decimal128-4-valid-012.phpt index 0820d82f8..aa93468f2 100644 --- a/tests/bson-corpus/decimal128-4-valid-012.phpt +++ b/tests/bson-corpus/decimal128-4-valid-012.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('1800000013640099761CC7B548F377DC80A131C836FE2F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.111111111111111111111111111112345"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1.1111111111111111111111111111123450"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 1800000013640099761cc7b548f377dc80a131c836fe2f00 -1800000013640099761cc7b548f377dc80a131c836fe2f00 -{"d":{"$numberDecimal":"1.111111111111111111111111111112345"}} {"d":{"$numberDecimal":"1.111111111111111111111111111112345"}} 1800000013640099761cc7b548f377dc80a131c836fe2f00 1800000013640099761cc7b548f377dc80a131c836fe2f00 -1800000013640099761cc7b548f377dc80a131c836fe2f00 -1800000013640099761cc7b548f377dc80a131c836fe2f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-4-valid-013.phpt b/tests/bson-corpus/decimal128-4-valid-013.phpt index eea96b2b8..c53c9554e 100644 --- a/tests/bson-corpus/decimal128-4-valid-013.phpt +++ b/tests/bson-corpus/decimal128-4-valid-013.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400000000000A5BC138938D44C64D31FC2F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0.1000000000000000000000000000000000"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : ".100000000000000000000000000000000000000000000000000000000000"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400000000000a5bc138938d44c64d31fc2f00 -18000000136400000000000a5bc138938d44c64d31fc2f00 -{"d":{"$numberDecimal":"0.1000000000000000000000000000000000"}} {"d":{"$numberDecimal":"0.1000000000000000000000000000000000"}} 18000000136400000000000a5bc138938d44c64d31fc2f00 18000000136400000000000a5bc138938d44c64d31fc2f00 -18000000136400000000000a5bc138938d44c64d31fc2f00 -18000000136400000000000a5bc138938d44c64d31fc2f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-001.phpt b/tests/bson-corpus/decimal128-5-valid-001.phpt index bf5e3dec5..f270a670f 100644 --- a/tests/bson-corpus/decimal128-5-valid-001.phpt +++ b/tests/bson-corpus/decimal128-5-valid-001.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400000000807F1BCF85B27059C8A43CFE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.230000000000000000000000000000000E+6144"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1.23E+6144"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400000000807f1bcf85b27059c8a43cfe5f00 -18000000136400000000807f1bcf85b27059c8a43cfe5f00 -{"d":{"$numberDecimal":"1.230000000000000000000000000000000E+6144"}} {"d":{"$numberDecimal":"1.230000000000000000000000000000000E+6144"}} 18000000136400000000807f1bcf85b27059c8a43cfe5f00 18000000136400000000807f1bcf85b27059c8a43cfe5f00 -18000000136400000000807f1bcf85b27059c8a43cfe5f00 -18000000136400000000807f1bcf85b27059c8a43cfe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-002.phpt b/tests/bson-corpus/decimal128-5-valid-002.phpt index 673e5a4b0..ec57121bf 100644 --- a/tests/bson-corpus/decimal128-5-valid-002.phpt +++ b/tests/bson-corpus/decimal128-5-valid-002.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400000000000A5BC138938D44C64D31FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.000000000000000000000000000000000E+6144"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1E+6144"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400000000000a5bc138938d44c64d31fe5f00 -18000000136400000000000a5bc138938d44c64d31fe5f00 -{"d":{"$numberDecimal":"1.000000000000000000000000000000000E+6144"}} {"d":{"$numberDecimal":"1.000000000000000000000000000000000E+6144"}} 18000000136400000000000a5bc138938d44c64d31fe5f00 18000000136400000000000a5bc138938d44c64d31fe5f00 -18000000136400000000000a5bc138938d44c64d31fe5f00 -18000000136400000000000a5bc138938d44c64d31fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-003.phpt b/tests/bson-corpus/decimal128-5-valid-003.phpt index 73a6908dc..c92b33592 100644 --- a/tests/bson-corpus/decimal128-5-valid-003.phpt +++ b/tests/bson-corpus/decimal128-5-valid-003.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000081EFAC855B416D2DEE04000000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.00000000000000000000000000000000E-6144"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.100000000000000000000000000000000E-6143"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000081efac855b416d2dee04000000 -180000001364000000000081efac855b416d2dee04000000 -{"d":{"$numberDecimal":"1.00000000000000000000000000000000E-6144"}} {"d":{"$numberDecimal":"1.00000000000000000000000000000000E-6144"}} 180000001364000000000081efac855b416d2dee04000000 180000001364000000000081efac855b416d2dee04000000 -180000001364000000000081efac855b416d2dee04000000 -180000001364000000000081efac855b416d2dee04000000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-004.phpt b/tests/bson-corpus/decimal128-5-valid-004.phpt index 1dad6515d..f34c7947a 100644 --- a/tests/bson-corpus/decimal128-5-valid-004.phpt +++ b/tests/bson-corpus/decimal128-5-valid-004.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000000000081EFAC855B416D2DEE04000000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.00000000000000000000000000000000E-6144"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000000000081efac855b416d2dee04000000 -180000001364000000000081efac855b416d2dee04000000 -{"d":{"$numberDecimal":"1.00000000000000000000000000000000E-6144"}} {"d":{"$numberDecimal":"1.00000000000000000000000000000000E-6144"}} 180000001364000000000081efac855b416d2dee04000000 -180000001364000000000081efac855b416d2dee04000000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-005.phpt b/tests/bson-corpus/decimal128-5-valid-005.phpt index 3d22be4b4..c53954977 100644 --- a/tests/bson-corpus/decimal128-5-valid-005.phpt +++ b/tests/bson-corpus/decimal128-5-valid-005.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000A00000000000000000000000000000000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.0E-6175"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.000000000000000000000000000000010E-6143"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000a00000000000000000000000000000000 -180000001364000a00000000000000000000000000000000 -{"d":{"$numberDecimal":"1.0E-6175"}} {"d":{"$numberDecimal":"1.0E-6175"}} 180000001364000a00000000000000000000000000000000 180000001364000a00000000000000000000000000000000 -180000001364000a00000000000000000000000000000000 -180000001364000a00000000000000000000000000000000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-006.phpt b/tests/bson-corpus/decimal128-5-valid-006.phpt index 87fa9e405..6cfe95265 100644 --- a/tests/bson-corpus/decimal128-5-valid-006.phpt +++ b/tests/bson-corpus/decimal128-5-valid-006.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000A00000000000000000000000000000000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.0E-6175"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000a00000000000000000000000000000000 -180000001364000a00000000000000000000000000000000 -{"d":{"$numberDecimal":"1.0E-6175"}} {"d":{"$numberDecimal":"1.0E-6175"}} 180000001364000a00000000000000000000000000000000 -180000001364000a00000000000000000000000000000000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-007.phpt b/tests/bson-corpus/decimal128-5-valid-007.phpt index 4450942df..01b6683ad 100644 --- a/tests/bson-corpus/decimal128-5-valid-007.phpt +++ b/tests/bson-corpus/decimal128-5-valid-007.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000100000000000000000000000000020000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1E-6175"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.00000000000000000000000000000001E-6143"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000100000000000000000000000000020000 -180000001364000100000000000000000000000000020000 -{"d":{"$numberDecimal":"1E-6175"}} {"d":{"$numberDecimal":"1E-6175"}} 180000001364000100000000000000000000000000020000 180000001364000100000000000000000000000000020000 -180000001364000100000000000000000000000000020000 -180000001364000100000000000000000000000000020000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-008.phpt b/tests/bson-corpus/decimal128-5-valid-008.phpt index ce92b5a9c..6eb4d5772 100644 --- a/tests/bson-corpus/decimal128-5-valid-008.phpt +++ b/tests/bson-corpus/decimal128-5-valid-008.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000100000000000000000000000000020000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1E-6175"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000100000000000000000000000000020000 -180000001364000100000000000000000000000000020000 -{"d":{"$numberDecimal":"1E-6175"}} {"d":{"$numberDecimal":"1E-6175"}} 180000001364000100000000000000000000000000020000 -180000001364000100000000000000000000000000020000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-009.phpt b/tests/bson-corpus/decimal128-5-valid-009.phpt index c09756ed7..cbfd7bbb0 100644 --- a/tests/bson-corpus/decimal128-5-valid-009.phpt +++ b/tests/bson-corpus/decimal128-5-valid-009.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000100000000000000000000000000000000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1E-6176"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0.000000000000000000000000000000001E-6143"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000100000000000000000000000000000000 -180000001364000100000000000000000000000000000000 -{"d":{"$numberDecimal":"1E-6176"}} {"d":{"$numberDecimal":"1E-6176"}} 180000001364000100000000000000000000000000000000 180000001364000100000000000000000000000000000000 -180000001364000100000000000000000000000000000000 -180000001364000100000000000000000000000000000000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-010.phpt b/tests/bson-corpus/decimal128-5-valid-010.phpt index 9d343f867..ec00f25bf 100644 --- a/tests/bson-corpus/decimal128-5-valid-010.phpt +++ b/tests/bson-corpus/decimal128-5-valid-010.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000100000000000000000000000000000000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1E-6176"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000100000000000000000000000000000000 -180000001364000100000000000000000000000000000000 -{"d":{"$numberDecimal":"1E-6176"}} {"d":{"$numberDecimal":"1E-6176"}} 180000001364000100000000000000000000000000000000 -180000001364000100000000000000000000000000000000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-011.phpt b/tests/bson-corpus/decimal128-5-valid-011.phpt index 33a9ce08a..67d2c1163 100644 --- a/tests/bson-corpus/decimal128-5-valid-011.phpt +++ b/tests/bson-corpus/decimal128-5-valid-011.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000100000000000000000000000000000000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1E-6176"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1e-6176"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000100000000000000000000000000000000 -180000001364000100000000000000000000000000000000 -{"d":{"$numberDecimal":"1E-6176"}} {"d":{"$numberDecimal":"1E-6176"}} 180000001364000100000000000000000000000000000000 180000001364000100000000000000000000000000000000 -180000001364000100000000000000000000000000000000 -180000001364000100000000000000000000000000000000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-012.phpt b/tests/bson-corpus/decimal128-5-valid-012.phpt index 1528750c1..f7cea5ed4 100644 --- a/tests/bson-corpus/decimal128-5-valid-012.phpt +++ b/tests/bson-corpus/decimal128-5-valid-012.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400FFFFFFFF095BC138938D44C64D31000000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "9.99999999999999999999999999999999E-6144"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "999999999999999999999999999999999e-6176"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400ffffffff095bc138938d44c64d31000000 -18000000136400ffffffff095bc138938d44c64d31000000 -{"d":{"$numberDecimal":"9.99999999999999999999999999999999E-6144"}} {"d":{"$numberDecimal":"9.99999999999999999999999999999999E-6144"}} 18000000136400ffffffff095bc138938d44c64d31000000 18000000136400ffffffff095bc138938d44c64d31000000 -18000000136400ffffffff095bc138938d44c64d31000000 -18000000136400ffffffff095bc138938d44c64d31000000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-013.phpt b/tests/bson-corpus/decimal128-5-valid-013.phpt index e7c65392e..4a3db422a 100644 --- a/tests/bson-corpus/decimal128-5-valid-013.phpt +++ b/tests/bson-corpus/decimal128-5-valid-013.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400000000807F1BCF85B27059C8A43CFEDF00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-1.230000000000000000000000000000000E+6144"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "-1.23E+6144"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400000000807f1bcf85b27059c8a43cfedf00 -18000000136400000000807f1bcf85b27059c8a43cfedf00 -{"d":{"$numberDecimal":"-1.230000000000000000000000000000000E+6144"}} {"d":{"$numberDecimal":"-1.230000000000000000000000000000000E+6144"}} 18000000136400000000807f1bcf85b27059c8a43cfedf00 18000000136400000000807f1bcf85b27059c8a43cfedf00 -18000000136400000000807f1bcf85b27059c8a43cfedf00 -18000000136400000000807f1bcf85b27059c8a43cfedf00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-014.phpt b/tests/bson-corpus/decimal128-5-valid-014.phpt index 971a63fa3..c08b348fc 100644 --- a/tests/bson-corpus/decimal128-5-valid-014.phpt +++ b/tests/bson-corpus/decimal128-5-valid-014.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400000000000A5BC138938D44C64D31FEDF00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-1.000000000000000000000000000000000E+6144"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "-1E+6144"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400000000000a5bc138938d44c64d31fedf00 -18000000136400000000000a5bc138938d44c64d31fedf00 -{"d":{"$numberDecimal":"-1.000000000000000000000000000000000E+6144"}} {"d":{"$numberDecimal":"-1.000000000000000000000000000000000E+6144"}} 18000000136400000000000a5bc138938d44c64d31fedf00 18000000136400000000000a5bc138938d44c64d31fedf00 -18000000136400000000000a5bc138938d44c64d31fedf00 -18000000136400000000000a5bc138938d44c64d31fedf00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-015.phpt b/tests/bson-corpus/decimal128-5-valid-015.phpt index 29f65822c..797bd22ce 100644 --- a/tests/bson-corpus/decimal128-5-valid-015.phpt +++ b/tests/bson-corpus/decimal128-5-valid-015.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000081EFAC855B416D2DEE04008000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-1.00000000000000000000000000000000E-6144"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "-0.100000000000000000000000000000000E-6143"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000081efac855b416d2dee04008000 -180000001364000000000081efac855b416d2dee04008000 -{"d":{"$numberDecimal":"-1.00000000000000000000000000000000E-6144"}} {"d":{"$numberDecimal":"-1.00000000000000000000000000000000E-6144"}} 180000001364000000000081efac855b416d2dee04008000 180000001364000000000081efac855b416d2dee04008000 -180000001364000000000081efac855b416d2dee04008000 -180000001364000000000081efac855b416d2dee04008000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-016.phpt b/tests/bson-corpus/decimal128-5-valid-016.phpt index 207f9705c..2e73f67b8 100644 --- a/tests/bson-corpus/decimal128-5-valid-016.phpt +++ b/tests/bson-corpus/decimal128-5-valid-016.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000000000081EFAC855B416D2DEE04008000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-1.00000000000000000000000000000000E-6144"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000000000081efac855b416d2dee04008000 -180000001364000000000081efac855b416d2dee04008000 -{"d":{"$numberDecimal":"-1.00000000000000000000000000000000E-6144"}} {"d":{"$numberDecimal":"-1.00000000000000000000000000000000E-6144"}} 180000001364000000000081efac855b416d2dee04008000 -180000001364000000000081efac855b416d2dee04008000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-017.phpt b/tests/bson-corpus/decimal128-5-valid-017.phpt index 9802afd5a..c20440274 100644 --- a/tests/bson-corpus/decimal128-5-valid-017.phpt +++ b/tests/bson-corpus/decimal128-5-valid-017.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000A00000000000000000000000000008000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-1.0E-6175"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "-0.000000000000000000000000000000010E-6143"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000a00000000000000000000000000008000 -180000001364000a00000000000000000000000000008000 -{"d":{"$numberDecimal":"-1.0E-6175"}} {"d":{"$numberDecimal":"-1.0E-6175"}} 180000001364000a00000000000000000000000000008000 180000001364000a00000000000000000000000000008000 -180000001364000a00000000000000000000000000008000 -180000001364000a00000000000000000000000000008000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-018.phpt b/tests/bson-corpus/decimal128-5-valid-018.phpt index b02c943a4..0a40f2958 100644 --- a/tests/bson-corpus/decimal128-5-valid-018.phpt +++ b/tests/bson-corpus/decimal128-5-valid-018.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000A00000000000000000000000000008000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-1.0E-6175"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000a00000000000000000000000000008000 -180000001364000a00000000000000000000000000008000 -{"d":{"$numberDecimal":"-1.0E-6175"}} {"d":{"$numberDecimal":"-1.0E-6175"}} 180000001364000a00000000000000000000000000008000 -180000001364000a00000000000000000000000000008000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-019.phpt b/tests/bson-corpus/decimal128-5-valid-019.phpt index 54ad5bb90..57e24ca55 100644 --- a/tests/bson-corpus/decimal128-5-valid-019.phpt +++ b/tests/bson-corpus/decimal128-5-valid-019.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000100000000000000000000000000028000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-1E-6175"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "-0.00000000000000000000000000000001E-6143"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000100000000000000000000000000028000 -180000001364000100000000000000000000000000028000 -{"d":{"$numberDecimal":"-1E-6175"}} {"d":{"$numberDecimal":"-1E-6175"}} 180000001364000100000000000000000000000000028000 180000001364000100000000000000000000000000028000 -180000001364000100000000000000000000000000028000 -180000001364000100000000000000000000000000028000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-020.phpt b/tests/bson-corpus/decimal128-5-valid-020.phpt index ada4ecaac..7b911ead4 100644 --- a/tests/bson-corpus/decimal128-5-valid-020.phpt +++ b/tests/bson-corpus/decimal128-5-valid-020.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000100000000000000000000000000028000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-1E-6175"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000100000000000000000000000000028000 -180000001364000100000000000000000000000000028000 -{"d":{"$numberDecimal":"-1E-6175"}} {"d":{"$numberDecimal":"-1E-6175"}} 180000001364000100000000000000000000000000028000 -180000001364000100000000000000000000000000028000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-021.phpt b/tests/bson-corpus/decimal128-5-valid-021.phpt index 7fc06f71d..00b8d0700 100644 --- a/tests/bson-corpus/decimal128-5-valid-021.phpt +++ b/tests/bson-corpus/decimal128-5-valid-021.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000100000000000000000000000000008000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-1E-6176"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "-0.000000000000000000000000000000001E-6143"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000100000000000000000000000000008000 -180000001364000100000000000000000000000000008000 -{"d":{"$numberDecimal":"-1E-6176"}} {"d":{"$numberDecimal":"-1E-6176"}} 180000001364000100000000000000000000000000008000 180000001364000100000000000000000000000000008000 -180000001364000100000000000000000000000000008000 -180000001364000100000000000000000000000000008000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-022.phpt b/tests/bson-corpus/decimal128-5-valid-022.phpt index eea572fb0..31e11cbef 100644 --- a/tests/bson-corpus/decimal128-5-valid-022.phpt +++ b/tests/bson-corpus/decimal128-5-valid-022.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000001364000100000000000000000000000000008000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-1E-6176"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000001364000100000000000000000000000000008000 -180000001364000100000000000000000000000000008000 -{"d":{"$numberDecimal":"-1E-6176"}} {"d":{"$numberDecimal":"-1E-6176"}} 180000001364000100000000000000000000000000008000 -180000001364000100000000000000000000000000008000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-023.phpt b/tests/bson-corpus/decimal128-5-valid-023.phpt index df50cc9c4..c90280f3f 100644 --- a/tests/bson-corpus/decimal128-5-valid-023.phpt +++ b/tests/bson-corpus/decimal128-5-valid-023.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000100000000000000000000000000008000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-1E-6176"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "-1e-6176"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000100000000000000000000000000008000 -180000001364000100000000000000000000000000008000 -{"d":{"$numberDecimal":"-1E-6176"}} {"d":{"$numberDecimal":"-1E-6176"}} 180000001364000100000000000000000000000000008000 180000001364000100000000000000000000000000008000 -180000001364000100000000000000000000000000008000 -180000001364000100000000000000000000000000008000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-024.phpt b/tests/bson-corpus/decimal128-5-valid-024.phpt index 506fa4fd3..deba1db31 100644 --- a/tests/bson-corpus/decimal128-5-valid-024.phpt +++ b/tests/bson-corpus/decimal128-5-valid-024.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400FFFFFFFF095BC138938D44C64D31008000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-9.99999999999999999999999999999999E-6144"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "-999999999999999999999999999999999e-6176"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400ffffffff095bc138938d44c64d31008000 -18000000136400ffffffff095bc138938d44c64d31008000 -{"d":{"$numberDecimal":"-9.99999999999999999999999999999999E-6144"}} {"d":{"$numberDecimal":"-9.99999999999999999999999999999999E-6144"}} 18000000136400ffffffff095bc138938d44c64d31008000 18000000136400ffffffff095bc138938d44c64d31008000 -18000000136400ffffffff095bc138938d44c64d31008000 -18000000136400ffffffff095bc138938d44c64d31008000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-025.phpt b/tests/bson-corpus/decimal128-5-valid-025.phpt index 3450a1552..9c3949a82 100644 --- a/tests/bson-corpus/decimal128-5-valid-025.phpt +++ b/tests/bson-corpus/decimal128-5-valid-025.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000000000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0E-6176"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0E-8000"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000000000 -180000001364000000000000000000000000000000000000 -{"d":{"$numberDecimal":"0E-6176"}} {"d":{"$numberDecimal":"0E-6176"}} 180000001364000000000000000000000000000000000000 180000001364000000000000000000000000000000000000 -180000001364000000000000000000000000000000000000 -180000001364000000000000000000000000000000000000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-026.phpt b/tests/bson-corpus/decimal128-5-valid-026.phpt index 786b490a4..b22470170 100644 --- a/tests/bson-corpus/decimal128-5-valid-026.phpt +++ b/tests/bson-corpus/decimal128-5-valid-026.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000000000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0E-6176"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0E-6177"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000000000 -180000001364000000000000000000000000000000000000 -{"d":{"$numberDecimal":"0E-6176"}} {"d":{"$numberDecimal":"0E-6176"}} 180000001364000000000000000000000000000000000000 180000001364000000000000000000000000000000000000 -180000001364000000000000000000000000000000000000 -180000001364000000000000000000000000000000000000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-027.phpt b/tests/bson-corpus/decimal128-5-valid-027.phpt index 33834b516..3136da348 100644 --- a/tests/bson-corpus/decimal128-5-valid-027.phpt +++ b/tests/bson-corpus/decimal128-5-valid-027.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0E+6111"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0E+6112"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000fe5f00 -180000001364000000000000000000000000000000fe5f00 -{"d":{"$numberDecimal":"0E+6111"}} {"d":{"$numberDecimal":"0E+6111"}} 180000001364000000000000000000000000000000fe5f00 180000001364000000000000000000000000000000fe5f00 -180000001364000000000000000000000000000000fe5f00 -180000001364000000000000000000000000000000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-028.phpt b/tests/bson-corpus/decimal128-5-valid-028.phpt index 1d4ad2e03..595fb24f8 100644 --- a/tests/bson-corpus/decimal128-5-valid-028.phpt +++ b/tests/bson-corpus/decimal128-5-valid-028.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0E+6111"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0E+6144"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000fe5f00 -180000001364000000000000000000000000000000fe5f00 -{"d":{"$numberDecimal":"0E+6111"}} {"d":{"$numberDecimal":"0E+6111"}} 180000001364000000000000000000000000000000fe5f00 180000001364000000000000000000000000000000fe5f00 -180000001364000000000000000000000000000000fe5f00 -180000001364000000000000000000000000000000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-029.phpt b/tests/bson-corpus/decimal128-5-valid-029.phpt index a348b6777..27039c30d 100644 --- a/tests/bson-corpus/decimal128-5-valid-029.phpt +++ b/tests/bson-corpus/decimal128-5-valid-029.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "0E+6111"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "0E+8000"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000fe5f00 -180000001364000000000000000000000000000000fe5f00 -{"d":{"$numberDecimal":"0E+6111"}} {"d":{"$numberDecimal":"0E+6111"}} 180000001364000000000000000000000000000000fe5f00 180000001364000000000000000000000000000000fe5f00 -180000001364000000000000000000000000000000fe5f00 -180000001364000000000000000000000000000000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-030.phpt b/tests/bson-corpus/decimal128-5-valid-030.phpt index 9c8f7f71e..d6b615f87 100644 --- a/tests/bson-corpus/decimal128-5-valid-030.phpt +++ b/tests/bson-corpus/decimal128-5-valid-030.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000008000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-0E-6176"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "-0E-8000"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000008000 -180000001364000000000000000000000000000000008000 -{"d":{"$numberDecimal":"-0E-6176"}} {"d":{"$numberDecimal":"-0E-6176"}} 180000001364000000000000000000000000000000008000 180000001364000000000000000000000000000000008000 -180000001364000000000000000000000000000000008000 -180000001364000000000000000000000000000000008000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-031.phpt b/tests/bson-corpus/decimal128-5-valid-031.phpt index 670cbf4f5..13bd9d685 100644 --- a/tests/bson-corpus/decimal128-5-valid-031.phpt +++ b/tests/bson-corpus/decimal128-5-valid-031.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000008000'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-0E-6176"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "-0E-6177"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000008000 -180000001364000000000000000000000000000000008000 -{"d":{"$numberDecimal":"-0E-6176"}} {"d":{"$numberDecimal":"-0E-6176"}} 180000001364000000000000000000000000000000008000 180000001364000000000000000000000000000000008000 -180000001364000000000000000000000000000000008000 -180000001364000000000000000000000000000000008000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-032.phpt b/tests/bson-corpus/decimal128-5-valid-032.phpt index 3fb3d04d3..f9e751dce 100644 --- a/tests/bson-corpus/decimal128-5-valid-032.phpt +++ b/tests/bson-corpus/decimal128-5-valid-032.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000FEDF00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-0E+6111"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "-0E+6112"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000fedf00 -180000001364000000000000000000000000000000fedf00 -{"d":{"$numberDecimal":"-0E+6111"}} {"d":{"$numberDecimal":"-0E+6111"}} 180000001364000000000000000000000000000000fedf00 180000001364000000000000000000000000000000fedf00 -180000001364000000000000000000000000000000fedf00 -180000001364000000000000000000000000000000fedf00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-033.phpt b/tests/bson-corpus/decimal128-5-valid-033.phpt index 3d3718e7b..be42009bf 100644 --- a/tests/bson-corpus/decimal128-5-valid-033.phpt +++ b/tests/bson-corpus/decimal128-5-valid-033.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000FEDF00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-0E+6111"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "-0E+6144"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000fedf00 -180000001364000000000000000000000000000000fedf00 -{"d":{"$numberDecimal":"-0E+6111"}} {"d":{"$numberDecimal":"-0E+6111"}} 180000001364000000000000000000000000000000fedf00 180000001364000000000000000000000000000000fedf00 -180000001364000000000000000000000000000000fedf00 -180000001364000000000000000000000000000000fedf00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-034.phpt b/tests/bson-corpus/decimal128-5-valid-034.phpt index 985c33c78..de185cf0d 100644 --- a/tests/bson-corpus/decimal128-5-valid-034.phpt +++ b/tests/bson-corpus/decimal128-5-valid-034.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000000000000000000000000FEDF00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "-0E+6111"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "-0E+8000"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000000000000000000000000fedf00 -180000001364000000000000000000000000000000fedf00 -{"d":{"$numberDecimal":"-0E+6111"}} {"d":{"$numberDecimal":"-0E+6111"}} 180000001364000000000000000000000000000000fedf00 180000001364000000000000000000000000000000fedf00 -180000001364000000000000000000000000000000fedf00 -180000001364000000000000000000000000000000fedf00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-035.phpt b/tests/bson-corpus/decimal128-5-valid-035.phpt index 23dd970a0..219acf6b9 100644 --- a/tests/bson-corpus/decimal128-5-valid-035.phpt +++ b/tests/bson-corpus/decimal128-5-valid-035.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400000000000A5BC138938D44C64D31FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.000000000000000000000000000000000E+6144"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1E+6144"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400000000000a5bc138938d44c64d31fe5f00 -18000000136400000000000a5bc138938d44c64d31fe5f00 -{"d":{"$numberDecimal":"1.000000000000000000000000000000000E+6144"}} {"d":{"$numberDecimal":"1.000000000000000000000000000000000E+6144"}} 18000000136400000000000a5bc138938d44c64d31fe5f00 18000000136400000000000a5bc138938d44c64d31fe5f00 -18000000136400000000000a5bc138938d44c64d31fe5f00 -18000000136400000000000a5bc138938d44c64d31fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-036.phpt b/tests/bson-corpus/decimal128-5-valid-036.phpt index 6b2e3a9a9..f5b4472af 100644 --- a/tests/bson-corpus/decimal128-5-valid-036.phpt +++ b/tests/bson-corpus/decimal128-5-valid-036.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000000081EFAC855B416D2DEE04FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.00000000000000000000000000000000E+6143"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1E+6143"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000000081efac855b416d2dee04fe5f00 -180000001364000000000081efac855b416d2dee04fe5f00 -{"d":{"$numberDecimal":"1.00000000000000000000000000000000E+6143"}} {"d":{"$numberDecimal":"1.00000000000000000000000000000000E+6143"}} 180000001364000000000081efac855b416d2dee04fe5f00 180000001364000000000081efac855b416d2dee04fe5f00 -180000001364000000000081efac855b416d2dee04fe5f00 -180000001364000000000081efac855b416d2dee04fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-037.phpt b/tests/bson-corpus/decimal128-5-valid-037.phpt index 25e9a0487..7c5b970a8 100644 --- a/tests/bson-corpus/decimal128-5-valid-037.phpt +++ b/tests/bson-corpus/decimal128-5-valid-037.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('1800000013640000000080264B91C02220BE377E00FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.0000000000000000000000000000000E+6142"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1E+6142"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 1800000013640000000080264b91c02220be377e00fe5f00 -1800000013640000000080264b91c02220be377e00fe5f00 -{"d":{"$numberDecimal":"1.0000000000000000000000000000000E+6142"}} {"d":{"$numberDecimal":"1.0000000000000000000000000000000E+6142"}} 1800000013640000000080264b91c02220be377e00fe5f00 1800000013640000000080264b91c02220be377e00fe5f00 -1800000013640000000080264b91c02220be377e00fe5f00 -1800000013640000000080264b91c02220be377e00fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-038.phpt b/tests/bson-corpus/decimal128-5-valid-038.phpt index ac433ca4a..3ea922a64 100644 --- a/tests/bson-corpus/decimal128-5-valid-038.phpt +++ b/tests/bson-corpus/decimal128-5-valid-038.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('1800000013640000000040EAED7446D09C2C9F0C00FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.000000000000000000000000000000E+6141"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1E+6141"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 1800000013640000000040eaed7446d09c2c9f0c00fe5f00 -1800000013640000000040eaed7446d09c2c9f0c00fe5f00 -{"d":{"$numberDecimal":"1.000000000000000000000000000000E+6141"}} {"d":{"$numberDecimal":"1.000000000000000000000000000000E+6141"}} 1800000013640000000040eaed7446d09c2c9f0c00fe5f00 1800000013640000000040eaed7446d09c2c9f0c00fe5f00 -1800000013640000000040eaed7446d09c2c9f0c00fe5f00 -1800000013640000000040eaed7446d09c2c9f0c00fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-039.phpt b/tests/bson-corpus/decimal128-5-valid-039.phpt index b6c68de9e..0759c937d 100644 --- a/tests/bson-corpus/decimal128-5-valid-039.phpt +++ b/tests/bson-corpus/decimal128-5-valid-039.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400000000A0CA17726DAE0F1E430100FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.00000000000000000000000000000E+6140"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1E+6140"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400000000a0ca17726dae0f1e430100fe5f00 -18000000136400000000a0ca17726dae0f1e430100fe5f00 -{"d":{"$numberDecimal":"1.00000000000000000000000000000E+6140"}} {"d":{"$numberDecimal":"1.00000000000000000000000000000E+6140"}} 18000000136400000000a0ca17726dae0f1e430100fe5f00 18000000136400000000a0ca17726dae0f1e430100fe5f00 -18000000136400000000a0ca17726dae0f1e430100fe5f00 -18000000136400000000a0ca17726dae0f1e430100fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-040.phpt b/tests/bson-corpus/decimal128-5-valid-040.phpt index 99403188b..bdd3e0f2a 100644 --- a/tests/bson-corpus/decimal128-5-valid-040.phpt +++ b/tests/bson-corpus/decimal128-5-valid-040.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400000000106102253E5ECE4F200000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.0000000000000000000000000000E+6139"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1E+6139"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400000000106102253e5ece4f200000fe5f00 -18000000136400000000106102253e5ece4f200000fe5f00 -{"d":{"$numberDecimal":"1.0000000000000000000000000000E+6139"}} {"d":{"$numberDecimal":"1.0000000000000000000000000000E+6139"}} 18000000136400000000106102253e5ece4f200000fe5f00 18000000136400000000106102253e5ece4f200000fe5f00 -18000000136400000000106102253e5ece4f200000fe5f00 -18000000136400000000106102253e5ece4f200000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-041.phpt b/tests/bson-corpus/decimal128-5-valid-041.phpt index 1adab98aa..98b9965b9 100644 --- a/tests/bson-corpus/decimal128-5-valid-041.phpt +++ b/tests/bson-corpus/decimal128-5-valid-041.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400000000E83C80D09F3C2E3B030000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.000000000000000000000000000E+6138"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1E+6138"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400000000e83c80d09f3c2e3b030000fe5f00 -18000000136400000000e83c80d09f3c2e3b030000fe5f00 -{"d":{"$numberDecimal":"1.000000000000000000000000000E+6138"}} {"d":{"$numberDecimal":"1.000000000000000000000000000E+6138"}} 18000000136400000000e83c80d09f3c2e3b030000fe5f00 18000000136400000000e83c80d09f3c2e3b030000fe5f00 -18000000136400000000e83c80d09f3c2e3b030000fe5f00 -18000000136400000000e83c80d09f3c2e3b030000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-042.phpt b/tests/bson-corpus/decimal128-5-valid-042.phpt index 67514d295..6226ec442 100644 --- a/tests/bson-corpus/decimal128-5-valid-042.phpt +++ b/tests/bson-corpus/decimal128-5-valid-042.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400000000E4D20CC8DCD2B752000000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.00000000000000000000000000E+6137"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1E+6137"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400000000e4d20cc8dcd2b752000000fe5f00 -18000000136400000000e4d20cc8dcd2b752000000fe5f00 -{"d":{"$numberDecimal":"1.00000000000000000000000000E+6137"}} {"d":{"$numberDecimal":"1.00000000000000000000000000E+6137"}} 18000000136400000000e4d20cc8dcd2b752000000fe5f00 18000000136400000000e4d20cc8dcd2b752000000fe5f00 -18000000136400000000e4d20cc8dcd2b752000000fe5f00 -18000000136400000000e4d20cc8dcd2b752000000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-043.phpt b/tests/bson-corpus/decimal128-5-valid-043.phpt index 66ccb03df..271009657 100644 --- a/tests/bson-corpus/decimal128-5-valid-043.phpt +++ b/tests/bson-corpus/decimal128-5-valid-043.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000004A48011416954508000000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.0000000000000000000000000E+6136"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1E+6136"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000004a48011416954508000000fe5f00 -180000001364000000004a48011416954508000000fe5f00 -{"d":{"$numberDecimal":"1.0000000000000000000000000E+6136"}} {"d":{"$numberDecimal":"1.0000000000000000000000000E+6136"}} 180000001364000000004a48011416954508000000fe5f00 180000001364000000004a48011416954508000000fe5f00 -180000001364000000004a48011416954508000000fe5f00 -180000001364000000004a48011416954508000000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-044.phpt b/tests/bson-corpus/decimal128-5-valid-044.phpt index 7f01cd756..857969078 100644 --- a/tests/bson-corpus/decimal128-5-valid-044.phpt +++ b/tests/bson-corpus/decimal128-5-valid-044.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400000000A1EDCCCE1BC2D300000000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.000000000000000000000000E+6135"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1E+6135"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400000000a1edccce1bc2d300000000fe5f00 -18000000136400000000a1edccce1bc2d300000000fe5f00 -{"d":{"$numberDecimal":"1.000000000000000000000000E+6135"}} {"d":{"$numberDecimal":"1.000000000000000000000000E+6135"}} 18000000136400000000a1edccce1bc2d300000000fe5f00 18000000136400000000a1edccce1bc2d300000000fe5f00 -18000000136400000000a1edccce1bc2d300000000fe5f00 -18000000136400000000a1edccce1bc2d300000000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-045.phpt b/tests/bson-corpus/decimal128-5-valid-045.phpt index 118e41474..ea7091e42 100644 --- a/tests/bson-corpus/decimal128-5-valid-045.phpt +++ b/tests/bson-corpus/decimal128-5-valid-045.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400000080F64AE1C7022D1500000000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.00000000000000000000000E+6134"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1E+6134"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400000080f64ae1c7022d1500000000fe5f00 -18000000136400000080f64ae1c7022d1500000000fe5f00 -{"d":{"$numberDecimal":"1.00000000000000000000000E+6134"}} {"d":{"$numberDecimal":"1.00000000000000000000000E+6134"}} 18000000136400000080f64ae1c7022d1500000000fe5f00 18000000136400000080f64ae1c7022d1500000000fe5f00 -18000000136400000080f64ae1c7022d1500000000fe5f00 -18000000136400000080f64ae1c7022d1500000000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-046.phpt b/tests/bson-corpus/decimal128-5-valid-046.phpt index f7313231e..3dd6e3c47 100644 --- a/tests/bson-corpus/decimal128-5-valid-046.phpt +++ b/tests/bson-corpus/decimal128-5-valid-046.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400000040B2BAC9E0191E0200000000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.0000000000000000000000E+6133"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1E+6133"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400000040b2bac9e0191e0200000000fe5f00 -18000000136400000040b2bac9e0191e0200000000fe5f00 -{"d":{"$numberDecimal":"1.0000000000000000000000E+6133"}} {"d":{"$numberDecimal":"1.0000000000000000000000E+6133"}} 18000000136400000040b2bac9e0191e0200000000fe5f00 18000000136400000040b2bac9e0191e0200000000fe5f00 -18000000136400000040b2bac9e0191e0200000000fe5f00 -18000000136400000040b2bac9e0191e0200000000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-047.phpt b/tests/bson-corpus/decimal128-5-valid-047.phpt index c71a25723..9a0e75046 100644 --- a/tests/bson-corpus/decimal128-5-valid-047.phpt +++ b/tests/bson-corpus/decimal128-5-valid-047.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000A0DEC5ADC935360000000000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.000000000000000000000E+6132"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1E+6132"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000a0dec5adc935360000000000fe5f00 -180000001364000000a0dec5adc935360000000000fe5f00 -{"d":{"$numberDecimal":"1.000000000000000000000E+6132"}} {"d":{"$numberDecimal":"1.000000000000000000000E+6132"}} 180000001364000000a0dec5adc935360000000000fe5f00 180000001364000000a0dec5adc935360000000000fe5f00 -180000001364000000a0dec5adc935360000000000fe5f00 -180000001364000000a0dec5adc935360000000000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-048.phpt b/tests/bson-corpus/decimal128-5-valid-048.phpt index 2c9a4b59d..f96ae314b 100644 --- a/tests/bson-corpus/decimal128-5-valid-048.phpt +++ b/tests/bson-corpus/decimal128-5-valid-048.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400000010632D5EC76B050000000000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.00000000000000000000E+6131"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1E+6131"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400000010632d5ec76b050000000000fe5f00 -18000000136400000010632d5ec76b050000000000fe5f00 -{"d":{"$numberDecimal":"1.00000000000000000000E+6131"}} {"d":{"$numberDecimal":"1.00000000000000000000E+6131"}} 18000000136400000010632d5ec76b050000000000fe5f00 18000000136400000010632d5ec76b050000000000fe5f00 -18000000136400000010632d5ec76b050000000000fe5f00 -18000000136400000010632d5ec76b050000000000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-049.phpt b/tests/bson-corpus/decimal128-5-valid-049.phpt index 868a17caa..af678aae1 100644 --- a/tests/bson-corpus/decimal128-5-valid-049.phpt +++ b/tests/bson-corpus/decimal128-5-valid-049.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000E8890423C78A000000000000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.0000000000000000000E+6130"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1E+6130"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000e8890423c78a000000000000fe5f00 -180000001364000000e8890423c78a000000000000fe5f00 -{"d":{"$numberDecimal":"1.0000000000000000000E+6130"}} {"d":{"$numberDecimal":"1.0000000000000000000E+6130"}} 180000001364000000e8890423c78a000000000000fe5f00 180000001364000000e8890423c78a000000000000fe5f00 -180000001364000000e8890423c78a000000000000fe5f00 -180000001364000000e8890423c78a000000000000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-050.phpt b/tests/bson-corpus/decimal128-5-valid-050.phpt index b67d50589..a289be7d5 100644 --- a/tests/bson-corpus/decimal128-5-valid-050.phpt +++ b/tests/bson-corpus/decimal128-5-valid-050.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400000064A7B3B6E00D000000000000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.000000000000000000E+6129"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1E+6129"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400000064a7b3b6e00d000000000000fe5f00 -18000000136400000064a7b3b6e00d000000000000fe5f00 -{"d":{"$numberDecimal":"1.000000000000000000E+6129"}} {"d":{"$numberDecimal":"1.000000000000000000E+6129"}} 18000000136400000064a7b3b6e00d000000000000fe5f00 18000000136400000064a7b3b6e00d000000000000fe5f00 -18000000136400000064a7b3b6e00d000000000000fe5f00 -18000000136400000064a7b3b6e00d000000000000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-051.phpt b/tests/bson-corpus/decimal128-5-valid-051.phpt index 13e34a4a5..70d3a9c17 100644 --- a/tests/bson-corpus/decimal128-5-valid-051.phpt +++ b/tests/bson-corpus/decimal128-5-valid-051.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('1800000013640000008A5D78456301000000000000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.00000000000000000E+6128"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1E+6128"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 1800000013640000008a5d78456301000000000000fe5f00 -1800000013640000008a5d78456301000000000000fe5f00 -{"d":{"$numberDecimal":"1.00000000000000000E+6128"}} {"d":{"$numberDecimal":"1.00000000000000000E+6128"}} 1800000013640000008a5d78456301000000000000fe5f00 1800000013640000008a5d78456301000000000000fe5f00 -1800000013640000008a5d78456301000000000000fe5f00 -1800000013640000008a5d78456301000000000000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-052.phpt b/tests/bson-corpus/decimal128-5-valid-052.phpt index 9fe13a58a..8fb5163bf 100644 --- a/tests/bson-corpus/decimal128-5-valid-052.phpt +++ b/tests/bson-corpus/decimal128-5-valid-052.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000000C16FF2862300000000000000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.0000000000000000E+6127"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1E+6127"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000000c16ff2862300000000000000fe5f00 -180000001364000000c16ff2862300000000000000fe5f00 -{"d":{"$numberDecimal":"1.0000000000000000E+6127"}} {"d":{"$numberDecimal":"1.0000000000000000E+6127"}} 180000001364000000c16ff2862300000000000000fe5f00 180000001364000000c16ff2862300000000000000fe5f00 -180000001364000000c16ff2862300000000000000fe5f00 -180000001364000000c16ff2862300000000000000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-053.phpt b/tests/bson-corpus/decimal128-5-valid-053.phpt index 672938250..c59494217 100644 --- a/tests/bson-corpus/decimal128-5-valid-053.phpt +++ b/tests/bson-corpus/decimal128-5-valid-053.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000080C6A47E8D0300000000000000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.000000000000000E+6126"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1E+6126"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000080c6a47e8d0300000000000000fe5f00 -180000001364000080c6a47e8d0300000000000000fe5f00 -{"d":{"$numberDecimal":"1.000000000000000E+6126"}} {"d":{"$numberDecimal":"1.000000000000000E+6126"}} 180000001364000080c6a47e8d0300000000000000fe5f00 180000001364000080c6a47e8d0300000000000000fe5f00 -180000001364000080c6a47e8d0300000000000000fe5f00 -180000001364000080c6a47e8d0300000000000000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-054.phpt b/tests/bson-corpus/decimal128-5-valid-054.phpt index eff242abc..0449143e8 100644 --- a/tests/bson-corpus/decimal128-5-valid-054.phpt +++ b/tests/bson-corpus/decimal128-5-valid-054.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('1800000013640000407A10F35A0000000000000000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.00000000000000E+6125"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1E+6125"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 1800000013640000407a10f35a0000000000000000fe5f00 -1800000013640000407a10f35a0000000000000000fe5f00 -{"d":{"$numberDecimal":"1.00000000000000E+6125"}} {"d":{"$numberDecimal":"1.00000000000000E+6125"}} 1800000013640000407a10f35a0000000000000000fe5f00 1800000013640000407a10f35a0000000000000000fe5f00 -1800000013640000407a10f35a0000000000000000fe5f00 -1800000013640000407a10f35a0000000000000000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-055.phpt b/tests/bson-corpus/decimal128-5-valid-055.phpt index ec9299ee6..13df67a6d 100644 --- a/tests/bson-corpus/decimal128-5-valid-055.phpt +++ b/tests/bson-corpus/decimal128-5-valid-055.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('1800000013640000A0724E18090000000000000000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.0000000000000E+6124"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1E+6124"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 1800000013640000a0724e18090000000000000000fe5f00 -1800000013640000a0724e18090000000000000000fe5f00 -{"d":{"$numberDecimal":"1.0000000000000E+6124"}} {"d":{"$numberDecimal":"1.0000000000000E+6124"}} 1800000013640000a0724e18090000000000000000fe5f00 1800000013640000a0724e18090000000000000000fe5f00 -1800000013640000a0724e18090000000000000000fe5f00 -1800000013640000a0724e18090000000000000000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-056.phpt b/tests/bson-corpus/decimal128-5-valid-056.phpt index 8f5c17003..106cc47b4 100644 --- a/tests/bson-corpus/decimal128-5-valid-056.phpt +++ b/tests/bson-corpus/decimal128-5-valid-056.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000010A5D4E8000000000000000000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.000000000000E+6123"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1E+6123"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000010a5d4e8000000000000000000fe5f00 -180000001364000010a5d4e8000000000000000000fe5f00 -{"d":{"$numberDecimal":"1.000000000000E+6123"}} {"d":{"$numberDecimal":"1.000000000000E+6123"}} 180000001364000010a5d4e8000000000000000000fe5f00 180000001364000010a5d4e8000000000000000000fe5f00 -180000001364000010a5d4e8000000000000000000fe5f00 -180000001364000010a5d4e8000000000000000000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-057.phpt b/tests/bson-corpus/decimal128-5-valid-057.phpt index 906b8f9c8..e1f7dcc94 100644 --- a/tests/bson-corpus/decimal128-5-valid-057.phpt +++ b/tests/bson-corpus/decimal128-5-valid-057.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('1800000013640000E8764817000000000000000000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.00000000000E+6122"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1E+6122"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 1800000013640000e8764817000000000000000000fe5f00 -1800000013640000e8764817000000000000000000fe5f00 -{"d":{"$numberDecimal":"1.00000000000E+6122"}} {"d":{"$numberDecimal":"1.00000000000E+6122"}} 1800000013640000e8764817000000000000000000fe5f00 1800000013640000e8764817000000000000000000fe5f00 -1800000013640000e8764817000000000000000000fe5f00 -1800000013640000e8764817000000000000000000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-058.phpt b/tests/bson-corpus/decimal128-5-valid-058.phpt index 65c042683..bdcbda01d 100644 --- a/tests/bson-corpus/decimal128-5-valid-058.phpt +++ b/tests/bson-corpus/decimal128-5-valid-058.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('1800000013640000E40B5402000000000000000000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.0000000000E+6121"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1E+6121"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 1800000013640000e40b5402000000000000000000fe5f00 -1800000013640000e40b5402000000000000000000fe5f00 -{"d":{"$numberDecimal":"1.0000000000E+6121"}} {"d":{"$numberDecimal":"1.0000000000E+6121"}} 1800000013640000e40b5402000000000000000000fe5f00 1800000013640000e40b5402000000000000000000fe5f00 -1800000013640000e40b5402000000000000000000fe5f00 -1800000013640000e40b5402000000000000000000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-059.phpt b/tests/bson-corpus/decimal128-5-valid-059.phpt index 0a8ba8e81..4695eff4b 100644 --- a/tests/bson-corpus/decimal128-5-valid-059.phpt +++ b/tests/bson-corpus/decimal128-5-valid-059.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('1800000013640000CA9A3B00000000000000000000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.000000000E+6120"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1E+6120"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 1800000013640000ca9a3b00000000000000000000fe5f00 -1800000013640000ca9a3b00000000000000000000fe5f00 -{"d":{"$numberDecimal":"1.000000000E+6120"}} {"d":{"$numberDecimal":"1.000000000E+6120"}} 1800000013640000ca9a3b00000000000000000000fe5f00 1800000013640000ca9a3b00000000000000000000fe5f00 -1800000013640000ca9a3b00000000000000000000fe5f00 -1800000013640000ca9a3b00000000000000000000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-060.phpt b/tests/bson-corpus/decimal128-5-valid-060.phpt index b3809e370..b973c0818 100644 --- a/tests/bson-corpus/decimal128-5-valid-060.phpt +++ b/tests/bson-corpus/decimal128-5-valid-060.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('1800000013640000E1F50500000000000000000000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.00000000E+6119"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1E+6119"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 1800000013640000e1f50500000000000000000000fe5f00 -1800000013640000e1f50500000000000000000000fe5f00 -{"d":{"$numberDecimal":"1.00000000E+6119"}} {"d":{"$numberDecimal":"1.00000000E+6119"}} 1800000013640000e1f50500000000000000000000fe5f00 1800000013640000e1f50500000000000000000000fe5f00 -1800000013640000e1f50500000000000000000000fe5f00 -1800000013640000e1f50500000000000000000000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-061.phpt b/tests/bson-corpus/decimal128-5-valid-061.phpt index 79454d5e6..a806ed21e 100644 --- a/tests/bson-corpus/decimal128-5-valid-061.phpt +++ b/tests/bson-corpus/decimal128-5-valid-061.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364008096980000000000000000000000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.0000000E+6118"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1E+6118"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364008096980000000000000000000000fe5f00 -180000001364008096980000000000000000000000fe5f00 -{"d":{"$numberDecimal":"1.0000000E+6118"}} {"d":{"$numberDecimal":"1.0000000E+6118"}} 180000001364008096980000000000000000000000fe5f00 180000001364008096980000000000000000000000fe5f00 -180000001364008096980000000000000000000000fe5f00 -180000001364008096980000000000000000000000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-062.phpt b/tests/bson-corpus/decimal128-5-valid-062.phpt index 7e0d0d1e1..bb9642f56 100644 --- a/tests/bson-corpus/decimal128-5-valid-062.phpt +++ b/tests/bson-corpus/decimal128-5-valid-062.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('1800000013640040420F0000000000000000000000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.000000E+6117"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1E+6117"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 1800000013640040420f0000000000000000000000fe5f00 -1800000013640040420f0000000000000000000000fe5f00 -{"d":{"$numberDecimal":"1.000000E+6117"}} {"d":{"$numberDecimal":"1.000000E+6117"}} 1800000013640040420f0000000000000000000000fe5f00 1800000013640040420f0000000000000000000000fe5f00 -1800000013640040420f0000000000000000000000fe5f00 -1800000013640040420f0000000000000000000000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-063.phpt b/tests/bson-corpus/decimal128-5-valid-063.phpt index 31a790fb9..137b9b6b4 100644 --- a/tests/bson-corpus/decimal128-5-valid-063.phpt +++ b/tests/bson-corpus/decimal128-5-valid-063.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400A086010000000000000000000000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.00000E+6116"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1E+6116"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400a086010000000000000000000000fe5f00 -18000000136400a086010000000000000000000000fe5f00 -{"d":{"$numberDecimal":"1.00000E+6116"}} {"d":{"$numberDecimal":"1.00000E+6116"}} 18000000136400a086010000000000000000000000fe5f00 18000000136400a086010000000000000000000000fe5f00 -18000000136400a086010000000000000000000000fe5f00 -18000000136400a086010000000000000000000000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-064.phpt b/tests/bson-corpus/decimal128-5-valid-064.phpt index c96796468..bb109b4f6 100644 --- a/tests/bson-corpus/decimal128-5-valid-064.phpt +++ b/tests/bson-corpus/decimal128-5-valid-064.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364001027000000000000000000000000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.0000E+6115"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1E+6115"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364001027000000000000000000000000fe5f00 -180000001364001027000000000000000000000000fe5f00 -{"d":{"$numberDecimal":"1.0000E+6115"}} {"d":{"$numberDecimal":"1.0000E+6115"}} 180000001364001027000000000000000000000000fe5f00 180000001364001027000000000000000000000000fe5f00 -180000001364001027000000000000000000000000fe5f00 -180000001364001027000000000000000000000000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-065.phpt b/tests/bson-corpus/decimal128-5-valid-065.phpt index af8a44f87..4dbff9208 100644 --- a/tests/bson-corpus/decimal128-5-valid-065.phpt +++ b/tests/bson-corpus/decimal128-5-valid-065.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('18000000136400E803000000000000000000000000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.000E+6114"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1E+6114"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 18000000136400e803000000000000000000000000fe5f00 -18000000136400e803000000000000000000000000fe5f00 -{"d":{"$numberDecimal":"1.000E+6114"}} {"d":{"$numberDecimal":"1.000E+6114"}} 18000000136400e803000000000000000000000000fe5f00 18000000136400e803000000000000000000000000fe5f00 -18000000136400e803000000000000000000000000fe5f00 -18000000136400e803000000000000000000000000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-066.phpt b/tests/bson-corpus/decimal128-5-valid-066.phpt index c60a73fea..49e17634f 100644 --- a/tests/bson-corpus/decimal128-5-valid-066.phpt +++ b/tests/bson-corpus/decimal128-5-valid-066.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364006400000000000000000000000000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.00E+6113"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1E+6113"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364006400000000000000000000000000fe5f00 -180000001364006400000000000000000000000000fe5f00 -{"d":{"$numberDecimal":"1.00E+6113"}} {"d":{"$numberDecimal":"1.00E+6113"}} 180000001364006400000000000000000000000000fe5f00 180000001364006400000000000000000000000000fe5f00 -180000001364006400000000000000000000000000fe5f00 -180000001364006400000000000000000000000000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/decimal128-5-valid-067.phpt b/tests/bson-corpus/decimal128-5-valid-067.phpt index 242a17f53..e02f6f3c5 100644 --- a/tests/bson-corpus/decimal128-5-valid-067.phpt +++ b/tests/bson-corpus/decimal128-5-valid-067.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('180000001364000A00000000000000000000000000FE5F00'); $canonicalExtJson = '{"d" : {"$numberDecimal" : "1.0E+6112"}}'; $degenerateExtJson = '{"d" : {"$numberDecimal" : "1E+6112"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 180000001364000a00000000000000000000000000fe5f00 -180000001364000a00000000000000000000000000fe5f00 -{"d":{"$numberDecimal":"1.0E+6112"}} {"d":{"$numberDecimal":"1.0E+6112"}} 180000001364000a00000000000000000000000000fe5f00 180000001364000a00000000000000000000000000fe5f00 -180000001364000a00000000000000000000000000fe5f00 -180000001364000a00000000000000000000000000fe5f00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/document-decodeError-001.phpt b/tests/bson-corpus/document-decodeError-001.phpt index c56374da1..15e352e16 100644 --- a/tests/bson-corpus/document-decodeError-001.phpt +++ b/tests/bson-corpus/document-decodeError-001.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('1800000003666F6F000F0000001062617200FFFFFF7F0000'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/document-decodeError-002.phpt b/tests/bson-corpus/document-decodeError-002.phpt index 16ccabbcf..e0d68a3a6 100644 --- a/tests/bson-corpus/document-decodeError-002.phpt +++ b/tests/bson-corpus/document-decodeError-002.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('1500000003666F6F000A0000000862617200010000'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/document-decodeError-003.phpt b/tests/bson-corpus/document-decodeError-003.phpt index b8fd39f03..f9f1b44c0 100644 --- a/tests/bson-corpus/document-decodeError-003.phpt +++ b/tests/bson-corpus/document-decodeError-003.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('1C00000003666F6F001200000002626172000500000062617A000000'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/document-decodeError-004.phpt b/tests/bson-corpus/document-decodeError-004.phpt index a339ad524..886fa2c7c 100644 --- a/tests/bson-corpus/document-decodeError-004.phpt +++ b/tests/bson-corpus/document-decodeError-004.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('150000000378000D00000010610000010000000000'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/document-valid-001.phpt b/tests/bson-corpus/document-valid-001.phpt index 528c8e08d..4733bdcc8 100644 --- a/tests/bson-corpus/document-valid-001.phpt +++ b/tests/bson-corpus/document-valid-001.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('0D000000037800050000000000'); $canonicalExtJson = '{"x" : {}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 0d000000037800050000000000 -0d000000037800050000000000 -{"x":{}} {"x":{}} 0d000000037800050000000000 -0d000000037800050000000000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/document-valid-002.phpt b/tests/bson-corpus/document-valid-002.phpt index 1c03ed4f7..ce1bd9ee6 100644 --- a/tests/bson-corpus/document-valid-002.phpt +++ b/tests/bson-corpus/document-valid-002.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('150000000378000D00000002000200000062000000'); $canonicalExtJson = '{"x" : {"" : "b"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 150000000378000d00000002000200000062000000 -150000000378000d00000002000200000062000000 -{"x":{"":"b"}} {"x":{"":"b"}} 150000000378000d00000002000200000062000000 -150000000378000d00000002000200000062000000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/document-valid-003.phpt b/tests/bson-corpus/document-valid-003.phpt index 3ed4dd3ec..70d45673e 100644 --- a/tests/bson-corpus/document-valid-003.phpt +++ b/tests/bson-corpus/document-valid-003.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('160000000378000E0000000261000200000062000000'); $canonicalExtJson = '{"x" : {"a" : "b"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 160000000378000e0000000261000200000062000000 -160000000378000e0000000261000200000062000000 -{"x":{"a":"b"}} {"x":{"a":"b"}} 160000000378000e0000000261000200000062000000 -160000000378000e0000000261000200000062000000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/document-valid-004.phpt b/tests/bson-corpus/document-valid-004.phpt index 4fb6ead65..eab1f4dcb 100644 --- a/tests/bson-corpus/document-valid-004.phpt +++ b/tests/bson-corpus/document-valid-004.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('170000000378000F000000022461000200000062000000'); $canonicalExtJson = '{"x" : {"$a" : "b"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 170000000378000f000000022461000200000062000000 -170000000378000f000000022461000200000062000000 -{"x":{"$a":"b"}} {"x":{"$a":"b"}} 170000000378000f000000022461000200000062000000 -170000000378000f000000022461000200000062000000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/document-valid-005.phpt b/tests/bson-corpus/document-valid-005.phpt index d9e127146..c150ff9c3 100644 --- a/tests/bson-corpus/document-valid-005.phpt +++ b/tests/bson-corpus/document-valid-005.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('160000000378000E0000000224000200000061000000'); $canonicalExtJson = '{"x" : {"$" : "a"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 160000000378000e0000000224000200000061000000 -160000000378000e0000000224000200000061000000 -{"x":{"$":"a"}} {"x":{"$":"a"}} 160000000378000e0000000224000200000061000000 -160000000378000e0000000224000200000061000000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/document-valid-006.phpt b/tests/bson-corpus/document-valid-006.phpt index c1a83fec1..74845bfb9 100644 --- a/tests/bson-corpus/document-valid-006.phpt +++ b/tests/bson-corpus/document-valid-006.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000000378001000000002612E62000200000063000000'); $canonicalExtJson = '{"x" : {"a.b" : "c"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000000378001000000002612e62000200000063000000 -180000000378001000000002612e62000200000063000000 -{"x":{"a.b":"c"}} {"x":{"a.b":"c"}} 180000000378001000000002612e62000200000063000000 -180000000378001000000002612e62000200000063000000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/document-valid-007.phpt b/tests/bson-corpus/document-valid-007.phpt index 91cfb4fcb..07b56d23e 100644 --- a/tests/bson-corpus/document-valid-007.phpt +++ b/tests/bson-corpus/document-valid-007.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('160000000378000E000000022E000200000061000000'); $canonicalExtJson = '{"x" : {"." : "a"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 160000000378000e000000022e000200000061000000 -160000000378000e000000022e000200000061000000 -{"x":{".":"a"}} {"x":{".":"a"}} 160000000378000e000000022e000200000061000000 -160000000378000e000000022e000200000061000000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/double-decodeError-001.phpt b/tests/bson-corpus/double-decodeError-001.phpt index 5ceb38756..961880a44 100644 --- a/tests/bson-corpus/double-decodeError-001.phpt +++ b/tests/bson-corpus/double-decodeError-001.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('0B0000000164000000F03F00'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/double-valid-001.phpt b/tests/bson-corpus/double-valid-001.phpt index 4418f8b91..f8ac004b2 100644 --- a/tests/bson-corpus/double-valid-001.phpt +++ b/tests/bson-corpus/double-valid-001.phpt @@ -13,33 +13,18 @@ $canonicalBson = hex2bin('10000000016400000000000000F03F00'); $canonicalExtJson = '{"d" : {"$numberDouble": "1.0"}}'; $relaxedExtJson = '{"d" : 1.0}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical BSON -> Relaxed extJSON -echo json_canonicalize(toRelaxedExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Relaxed extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toRelaxedExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Relaxed extJSON -> BSON -> Relaxed extJSON -echo json_canonicalize(toRelaxedExtendedJSON(fromJSON($relaxedExtJson))), "\n"; - // Relaxed extJSON -> BSON object -> Relaxed extJSON echo json_canonicalize(MongoDB\BSON\Document::fromJSON($relaxedExtJson)->toRelaxedExtendedJSON()), "\n"; @@ -48,13 +33,8 @@ echo json_canonicalize(MongoDB\BSON\Document::fromJSON($relaxedExtJson)->toRelax --EXPECT-- 10000000016400000000000000f03f00 -10000000016400000000000000f03f00 -{"d":{"$numberDouble":"1"}} {"d":{"$numberDouble":"1"}} {"d":1} -{"d":1} 10000000016400000000000000f03f00 -10000000016400000000000000f03f00 -{"d":1} {"d":1} ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/double-valid-002.phpt b/tests/bson-corpus/double-valid-002.phpt index e5969bbe3..c3cbbaaad 100644 --- a/tests/bson-corpus/double-valid-002.phpt +++ b/tests/bson-corpus/double-valid-002.phpt @@ -13,33 +13,18 @@ $canonicalBson = hex2bin('10000000016400000000000000F0BF00'); $canonicalExtJson = '{"d" : {"$numberDouble": "-1.0"}}'; $relaxedExtJson = '{"d" : -1.0}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical BSON -> Relaxed extJSON -echo json_canonicalize(toRelaxedExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Relaxed extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toRelaxedExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Relaxed extJSON -> BSON -> Relaxed extJSON -echo json_canonicalize(toRelaxedExtendedJSON(fromJSON($relaxedExtJson))), "\n"; - // Relaxed extJSON -> BSON object -> Relaxed extJSON echo json_canonicalize(MongoDB\BSON\Document::fromJSON($relaxedExtJson)->toRelaxedExtendedJSON()), "\n"; @@ -48,13 +33,8 @@ echo json_canonicalize(MongoDB\BSON\Document::fromJSON($relaxedExtJson)->toRelax --EXPECT-- 10000000016400000000000000f0bf00 -10000000016400000000000000f0bf00 -{"d":{"$numberDouble":"-1"}} {"d":{"$numberDouble":"-1"}} {"d":-1} -{"d":-1} 10000000016400000000000000f0bf00 -10000000016400000000000000f0bf00 -{"d":-1} {"d":-1} ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/double-valid-003.phpt b/tests/bson-corpus/double-valid-003.phpt index 4f8755630..2475b97e2 100644 --- a/tests/bson-corpus/double-valid-003.phpt +++ b/tests/bson-corpus/double-valid-003.phpt @@ -13,33 +13,18 @@ $canonicalBson = hex2bin('10000000016400000000008000F03F00'); $canonicalExtJson = '{"d" : {"$numberDouble": "1.0001220703125"}}'; $relaxedExtJson = '{"d" : 1.0001220703125}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical BSON -> Relaxed extJSON -echo json_canonicalize(toRelaxedExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Relaxed extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toRelaxedExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Relaxed extJSON -> BSON -> Relaxed extJSON -echo json_canonicalize(toRelaxedExtendedJSON(fromJSON($relaxedExtJson))), "\n"; - // Relaxed extJSON -> BSON object -> Relaxed extJSON echo json_canonicalize(MongoDB\BSON\Document::fromJSON($relaxedExtJson)->toRelaxedExtendedJSON()), "\n"; @@ -48,13 +33,8 @@ echo json_canonicalize(MongoDB\BSON\Document::fromJSON($relaxedExtJson)->toRelax --EXPECT-- 10000000016400000000008000f03f00 -10000000016400000000008000f03f00 -{"d":{"$numberDouble":"1.0001220703125"}} {"d":{"$numberDouble":"1.0001220703125"}} {"d":1.0001220703125} -{"d":1.0001220703125} 10000000016400000000008000f03f00 -10000000016400000000008000f03f00 -{"d":1.0001220703125} {"d":1.0001220703125} ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/double-valid-004.phpt b/tests/bson-corpus/double-valid-004.phpt index b45f77f38..97a335bd3 100644 --- a/tests/bson-corpus/double-valid-004.phpt +++ b/tests/bson-corpus/double-valid-004.phpt @@ -13,33 +13,18 @@ $canonicalBson = hex2bin('10000000016400000000008000F0BF00'); $canonicalExtJson = '{"d" : {"$numberDouble": "-1.0001220703125"}}'; $relaxedExtJson = '{"d" : -1.0001220703125}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical BSON -> Relaxed extJSON -echo json_canonicalize(toRelaxedExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Relaxed extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toRelaxedExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Relaxed extJSON -> BSON -> Relaxed extJSON -echo json_canonicalize(toRelaxedExtendedJSON(fromJSON($relaxedExtJson))), "\n"; - // Relaxed extJSON -> BSON object -> Relaxed extJSON echo json_canonicalize(MongoDB\BSON\Document::fromJSON($relaxedExtJson)->toRelaxedExtendedJSON()), "\n"; @@ -48,13 +33,8 @@ echo json_canonicalize(MongoDB\BSON\Document::fromJSON($relaxedExtJson)->toRelax --EXPECT-- 10000000016400000000008000f0bf00 -10000000016400000000008000f0bf00 -{"d":{"$numberDouble":"-1.0001220703125"}} {"d":{"$numberDouble":"-1.0001220703125"}} {"d":-1.0001220703125} -{"d":-1.0001220703125} 10000000016400000000008000f0bf00 -10000000016400000000008000f0bf00 -{"d":-1.0001220703125} {"d":-1.0001220703125} ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/double-valid-005.phpt b/tests/bson-corpus/double-valid-005.phpt index e63cf8adf..9e9ed9489 100644 --- a/tests/bson-corpus/double-valid-005.phpt +++ b/tests/bson-corpus/double-valid-005.phpt @@ -13,33 +13,18 @@ $canonicalBson = hex2bin('100000000164002a1bf5f41022b14300'); $canonicalExtJson = '{"d" : {"$numberDouble": "1.2345678921232E+18"}}'; $relaxedExtJson = '{"d" : 1.2345678921232E+18}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical BSON -> Relaxed extJSON -echo json_canonicalize(toRelaxedExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Relaxed extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toRelaxedExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Relaxed extJSON -> BSON -> Relaxed extJSON -echo json_canonicalize(toRelaxedExtendedJSON(fromJSON($relaxedExtJson))), "\n"; - // Relaxed extJSON -> BSON object -> Relaxed extJSON echo json_canonicalize(MongoDB\BSON\Document::fromJSON($relaxedExtJson)->toRelaxedExtendedJSON()), "\n"; @@ -48,13 +33,8 @@ echo json_canonicalize(MongoDB\BSON\Document::fromJSON($relaxedExtJson)->toRelax --EXPECT-- 100000000164002a1bf5f41022b14300 -100000000164002a1bf5f41022b14300 -{"d":{"$numberDouble":"1.2345678921232e+18"}} {"d":{"$numberDouble":"1.2345678921232e+18"}} {"d":1.2345678921232e+18} -{"d":1.2345678921232e+18} 100000000164002a1bf5f41022b14300 -100000000164002a1bf5f41022b14300 -{"d":1.2345678921232e+18} {"d":1.2345678921232e+18} ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/double-valid-006.phpt b/tests/bson-corpus/double-valid-006.phpt index b60799981..a8812a660 100644 --- a/tests/bson-corpus/double-valid-006.phpt +++ b/tests/bson-corpus/double-valid-006.phpt @@ -13,33 +13,18 @@ $canonicalBson = hex2bin('100000000164002a1bf5f41022b1c300'); $canonicalExtJson = '{"d" : {"$numberDouble": "-1.2345678921232E+18"}}'; $relaxedExtJson = '{"d" : -1.2345678921232E+18}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical BSON -> Relaxed extJSON -echo json_canonicalize(toRelaxedExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Relaxed extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toRelaxedExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Relaxed extJSON -> BSON -> Relaxed extJSON -echo json_canonicalize(toRelaxedExtendedJSON(fromJSON($relaxedExtJson))), "\n"; - // Relaxed extJSON -> BSON object -> Relaxed extJSON echo json_canonicalize(MongoDB\BSON\Document::fromJSON($relaxedExtJson)->toRelaxedExtendedJSON()), "\n"; @@ -48,13 +33,8 @@ echo json_canonicalize(MongoDB\BSON\Document::fromJSON($relaxedExtJson)->toRelax --EXPECT-- 100000000164002a1bf5f41022b1c300 -100000000164002a1bf5f41022b1c300 -{"d":{"$numberDouble":"-1.2345678921232e+18"}} {"d":{"$numberDouble":"-1.2345678921232e+18"}} {"d":-1.2345678921232e+18} -{"d":-1.2345678921232e+18} 100000000164002a1bf5f41022b1c300 -100000000164002a1bf5f41022b1c300 -{"d":-1.2345678921232e+18} {"d":-1.2345678921232e+18} ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/double-valid-007.phpt b/tests/bson-corpus/double-valid-007.phpt index 70b05917c..16db5157a 100644 --- a/tests/bson-corpus/double-valid-007.phpt +++ b/tests/bson-corpus/double-valid-007.phpt @@ -13,33 +13,18 @@ $canonicalBson = hex2bin('10000000016400000000000000000000'); $canonicalExtJson = '{"d" : {"$numberDouble": "0.0"}}'; $relaxedExtJson = '{"d" : 0.0}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical BSON -> Relaxed extJSON -echo json_canonicalize(toRelaxedExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Relaxed extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toRelaxedExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Relaxed extJSON -> BSON -> Relaxed extJSON -echo json_canonicalize(toRelaxedExtendedJSON(fromJSON($relaxedExtJson))), "\n"; - // Relaxed extJSON -> BSON object -> Relaxed extJSON echo json_canonicalize(MongoDB\BSON\Document::fromJSON($relaxedExtJson)->toRelaxedExtendedJSON()), "\n"; @@ -48,13 +33,8 @@ echo json_canonicalize(MongoDB\BSON\Document::fromJSON($relaxedExtJson)->toRelax --EXPECT-- 10000000016400000000000000000000 -10000000016400000000000000000000 -{"d":{"$numberDouble":"0"}} {"d":{"$numberDouble":"0"}} {"d":0} -{"d":0} 10000000016400000000000000000000 -10000000016400000000000000000000 -{"d":0} {"d":0} ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/double-valid-008.phpt b/tests/bson-corpus/double-valid-008.phpt index aff80f543..d95fe8e12 100644 --- a/tests/bson-corpus/double-valid-008.phpt +++ b/tests/bson-corpus/double-valid-008.phpt @@ -13,33 +13,18 @@ $canonicalBson = hex2bin('10000000016400000000000000008000'); $canonicalExtJson = '{"d" : {"$numberDouble": "-0.0"}}'; $relaxedExtJson = '{"d" : -0.0}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical BSON -> Relaxed extJSON -echo json_canonicalize(toRelaxedExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Relaxed extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toRelaxedExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Relaxed extJSON -> BSON -> Relaxed extJSON -echo json_canonicalize(toRelaxedExtendedJSON(fromJSON($relaxedExtJson))), "\n"; - // Relaxed extJSON -> BSON object -> Relaxed extJSON echo json_canonicalize(MongoDB\BSON\Document::fromJSON($relaxedExtJson)->toRelaxedExtendedJSON()), "\n"; @@ -48,13 +33,8 @@ echo json_canonicalize(MongoDB\BSON\Document::fromJSON($relaxedExtJson)->toRelax --EXPECT-- 10000000016400000000000000008000 -10000000016400000000000000008000 -{"d":{"$numberDouble":"-0"}} {"d":{"$numberDouble":"-0"}} {"d":-0} -{"d":-0} 10000000016400000000000000008000 -10000000016400000000000000008000 -{"d":-0} {"d":-0} ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/double-valid-009.phpt b/tests/bson-corpus/double-valid-009.phpt index 356368bd1..2e4829f45 100644 --- a/tests/bson-corpus/double-valid-009.phpt +++ b/tests/bson-corpus/double-valid-009.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('10000000016400000000000000F87F00'); $canonicalExtJson = '{"d": {"$numberDouble": "NaN"}}'; $relaxedExtJson = '{"d": {"$numberDouble": "NaN"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical BSON -> Relaxed extJSON -echo json_canonicalize(toRelaxedExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Relaxed extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toRelaxedExtendedJSON()), "\n"; -// Relaxed extJSON -> BSON -> Relaxed extJSON -echo json_canonicalize(toRelaxedExtendedJSON(fromJSON($relaxedExtJson))), "\n"; - // Relaxed extJSON -> BSON object -> Relaxed extJSON echo json_canonicalize(MongoDB\BSON\Document::fromJSON($relaxedExtJson)->toRelaxedExtendedJSON()), "\n"; @@ -42,10 +30,6 @@ echo json_canonicalize(MongoDB\BSON\Document::fromJSON($relaxedExtJson)->toRelax --EXPECT-- 10000000016400000000000000f87f00 -10000000016400000000000000f87f00 -{"d":{"$numberDouble":"NaN"}} -{"d":{"$numberDouble":"NaN"}} -{"d":{"$numberDouble":"NaN"}} {"d":{"$numberDouble":"NaN"}} {"d":{"$numberDouble":"NaN"}} {"d":{"$numberDouble":"NaN"}} diff --git a/tests/bson-corpus/double-valid-010.phpt b/tests/bson-corpus/double-valid-010.phpt index 5f494c172..3f0f1e551 100644 --- a/tests/bson-corpus/double-valid-010.phpt +++ b/tests/bson-corpus/double-valid-010.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('10000000016400120000000000F87F00'); $canonicalExtJson = '{"d": {"$numberDouble": "NaN"}}'; $relaxedExtJson = '{"d": {"$numberDouble": "NaN"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical BSON -> Relaxed extJSON -echo json_canonicalize(toRelaxedExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Relaxed extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toRelaxedExtendedJSON()), "\n"; -// Relaxed extJSON -> BSON -> Relaxed extJSON -echo json_canonicalize(toRelaxedExtendedJSON(fromJSON($relaxedExtJson))), "\n"; - // Relaxed extJSON -> BSON object -> Relaxed extJSON echo json_canonicalize(MongoDB\BSON\Document::fromJSON($relaxedExtJson)->toRelaxedExtendedJSON()), "\n"; @@ -42,10 +30,6 @@ echo json_canonicalize(MongoDB\BSON\Document::fromJSON($relaxedExtJson)->toRelax --EXPECT-- 10000000016400120000000000f87f00 -10000000016400120000000000f87f00 -{"d":{"$numberDouble":"NaN"}} -{"d":{"$numberDouble":"NaN"}} -{"d":{"$numberDouble":"NaN"}} {"d":{"$numberDouble":"NaN"}} {"d":{"$numberDouble":"NaN"}} {"d":{"$numberDouble":"NaN"}} diff --git a/tests/bson-corpus/double-valid-011.phpt b/tests/bson-corpus/double-valid-011.phpt index cf0e9373b..53084542e 100644 --- a/tests/bson-corpus/double-valid-011.phpt +++ b/tests/bson-corpus/double-valid-011.phpt @@ -13,33 +13,18 @@ $canonicalBson = hex2bin('10000000016400000000000000F07F00'); $canonicalExtJson = '{"d": {"$numberDouble": "Infinity"}}'; $relaxedExtJson = '{"d": {"$numberDouble": "Infinity"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical BSON -> Relaxed extJSON -echo json_canonicalize(toRelaxedExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Relaxed extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toRelaxedExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Relaxed extJSON -> BSON -> Relaxed extJSON -echo json_canonicalize(toRelaxedExtendedJSON(fromJSON($relaxedExtJson))), "\n"; - // Relaxed extJSON -> BSON object -> Relaxed extJSON echo json_canonicalize(MongoDB\BSON\Document::fromJSON($relaxedExtJson)->toRelaxedExtendedJSON()), "\n"; @@ -48,13 +33,8 @@ echo json_canonicalize(MongoDB\BSON\Document::fromJSON($relaxedExtJson)->toRelax --EXPECT-- 10000000016400000000000000f07f00 -10000000016400000000000000f07f00 -{"d":{"$numberDouble":"Infinity"}} -{"d":{"$numberDouble":"Infinity"}} {"d":{"$numberDouble":"Infinity"}} {"d":{"$numberDouble":"Infinity"}} 10000000016400000000000000f07f00 -10000000016400000000000000f07f00 -{"d":{"$numberDouble":"Infinity"}} {"d":{"$numberDouble":"Infinity"}} ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/double-valid-012.phpt b/tests/bson-corpus/double-valid-012.phpt index 9c4cc9f20..77cb265bc 100644 --- a/tests/bson-corpus/double-valid-012.phpt +++ b/tests/bson-corpus/double-valid-012.phpt @@ -13,33 +13,18 @@ $canonicalBson = hex2bin('10000000016400000000000000F0FF00'); $canonicalExtJson = '{"d": {"$numberDouble": "-Infinity"}}'; $relaxedExtJson = '{"d": {"$numberDouble": "-Infinity"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical BSON -> Relaxed extJSON -echo json_canonicalize(toRelaxedExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Relaxed extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toRelaxedExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Relaxed extJSON -> BSON -> Relaxed extJSON -echo json_canonicalize(toRelaxedExtendedJSON(fromJSON($relaxedExtJson))), "\n"; - // Relaxed extJSON -> BSON object -> Relaxed extJSON echo json_canonicalize(MongoDB\BSON\Document::fromJSON($relaxedExtJson)->toRelaxedExtendedJSON()), "\n"; @@ -48,13 +33,8 @@ echo json_canonicalize(MongoDB\BSON\Document::fromJSON($relaxedExtJson)->toRelax --EXPECT-- 10000000016400000000000000f0ff00 -10000000016400000000000000f0ff00 -{"d":{"$numberDouble":"-Infinity"}} -{"d":{"$numberDouble":"-Infinity"}} {"d":{"$numberDouble":"-Infinity"}} {"d":{"$numberDouble":"-Infinity"}} 10000000016400000000000000f0ff00 -10000000016400000000000000f0ff00 -{"d":{"$numberDouble":"-Infinity"}} {"d":{"$numberDouble":"-Infinity"}} ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/int32-decodeError-001.phpt b/tests/bson-corpus/int32-decodeError-001.phpt index 209a28235..fbe9f10b6 100644 --- a/tests/bson-corpus/int32-decodeError-001.phpt +++ b/tests/bson-corpus/int32-decodeError-001.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('090000001061000500'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/int32-valid-001.phpt b/tests/bson-corpus/int32-valid-001.phpt index 5baaf0368..01ee3b1e0 100644 --- a/tests/bson-corpus/int32-valid-001.phpt +++ b/tests/bson-corpus/int32-valid-001.phpt @@ -13,33 +13,18 @@ $canonicalBson = hex2bin('0C0000001069000000008000'); $canonicalExtJson = '{"i" : {"$numberInt": "-2147483648"}}'; $relaxedExtJson = '{"i" : -2147483648}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical BSON -> Relaxed extJSON -echo json_canonicalize(toRelaxedExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Relaxed extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toRelaxedExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Relaxed extJSON -> BSON -> Relaxed extJSON -echo json_canonicalize(toRelaxedExtendedJSON(fromJSON($relaxedExtJson))), "\n"; - // Relaxed extJSON -> BSON object -> Relaxed extJSON echo json_canonicalize(MongoDB\BSON\Document::fromJSON($relaxedExtJson)->toRelaxedExtendedJSON()), "\n"; @@ -48,13 +33,8 @@ echo json_canonicalize(MongoDB\BSON\Document::fromJSON($relaxedExtJson)->toRelax --EXPECT-- 0c0000001069000000008000 -0c0000001069000000008000 -{"i":{"$numberInt":"-2147483648"}} {"i":{"$numberInt":"-2147483648"}} {"i":-2147483648} -{"i":-2147483648} 0c0000001069000000008000 -0c0000001069000000008000 -{"i":-2147483648} {"i":-2147483648} ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/int32-valid-002.phpt b/tests/bson-corpus/int32-valid-002.phpt index f1665f0c4..b143dc4bd 100644 --- a/tests/bson-corpus/int32-valid-002.phpt +++ b/tests/bson-corpus/int32-valid-002.phpt @@ -13,33 +13,18 @@ $canonicalBson = hex2bin('0C000000106900FFFFFF7F00'); $canonicalExtJson = '{"i" : {"$numberInt": "2147483647"}}'; $relaxedExtJson = '{"i" : 2147483647}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical BSON -> Relaxed extJSON -echo json_canonicalize(toRelaxedExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Relaxed extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toRelaxedExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Relaxed extJSON -> BSON -> Relaxed extJSON -echo json_canonicalize(toRelaxedExtendedJSON(fromJSON($relaxedExtJson))), "\n"; - // Relaxed extJSON -> BSON object -> Relaxed extJSON echo json_canonicalize(MongoDB\BSON\Document::fromJSON($relaxedExtJson)->toRelaxedExtendedJSON()), "\n"; @@ -48,13 +33,8 @@ echo json_canonicalize(MongoDB\BSON\Document::fromJSON($relaxedExtJson)->toRelax --EXPECT-- 0c000000106900ffffff7f00 -0c000000106900ffffff7f00 -{"i":{"$numberInt":"2147483647"}} {"i":{"$numberInt":"2147483647"}} {"i":2147483647} -{"i":2147483647} 0c000000106900ffffff7f00 -0c000000106900ffffff7f00 -{"i":2147483647} {"i":2147483647} ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/int32-valid-003.phpt b/tests/bson-corpus/int32-valid-003.phpt index 2a76520e4..1b0eac867 100644 --- a/tests/bson-corpus/int32-valid-003.phpt +++ b/tests/bson-corpus/int32-valid-003.phpt @@ -13,33 +13,18 @@ $canonicalBson = hex2bin('0C000000106900FFFFFFFF00'); $canonicalExtJson = '{"i" : {"$numberInt": "-1"}}'; $relaxedExtJson = '{"i" : -1}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical BSON -> Relaxed extJSON -echo json_canonicalize(toRelaxedExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Relaxed extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toRelaxedExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Relaxed extJSON -> BSON -> Relaxed extJSON -echo json_canonicalize(toRelaxedExtendedJSON(fromJSON($relaxedExtJson))), "\n"; - // Relaxed extJSON -> BSON object -> Relaxed extJSON echo json_canonicalize(MongoDB\BSON\Document::fromJSON($relaxedExtJson)->toRelaxedExtendedJSON()), "\n"; @@ -48,13 +33,8 @@ echo json_canonicalize(MongoDB\BSON\Document::fromJSON($relaxedExtJson)->toRelax --EXPECT-- 0c000000106900ffffffff00 -0c000000106900ffffffff00 -{"i":{"$numberInt":"-1"}} {"i":{"$numberInt":"-1"}} {"i":-1} -{"i":-1} 0c000000106900ffffffff00 -0c000000106900ffffffff00 -{"i":-1} {"i":-1} ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/int32-valid-004.phpt b/tests/bson-corpus/int32-valid-004.phpt index 53c0df67e..4625e014b 100644 --- a/tests/bson-corpus/int32-valid-004.phpt +++ b/tests/bson-corpus/int32-valid-004.phpt @@ -13,33 +13,18 @@ $canonicalBson = hex2bin('0C0000001069000000000000'); $canonicalExtJson = '{"i" : {"$numberInt": "0"}}'; $relaxedExtJson = '{"i" : 0}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical BSON -> Relaxed extJSON -echo json_canonicalize(toRelaxedExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Relaxed extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toRelaxedExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Relaxed extJSON -> BSON -> Relaxed extJSON -echo json_canonicalize(toRelaxedExtendedJSON(fromJSON($relaxedExtJson))), "\n"; - // Relaxed extJSON -> BSON object -> Relaxed extJSON echo json_canonicalize(MongoDB\BSON\Document::fromJSON($relaxedExtJson)->toRelaxedExtendedJSON()), "\n"; @@ -48,13 +33,8 @@ echo json_canonicalize(MongoDB\BSON\Document::fromJSON($relaxedExtJson)->toRelax --EXPECT-- 0c0000001069000000000000 -0c0000001069000000000000 -{"i":{"$numberInt":"0"}} {"i":{"$numberInt":"0"}} {"i":0} -{"i":0} 0c0000001069000000000000 -0c0000001069000000000000 -{"i":0} {"i":0} ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/int32-valid-005.phpt b/tests/bson-corpus/int32-valid-005.phpt index 5a2184d20..1c0e71c9d 100644 --- a/tests/bson-corpus/int32-valid-005.phpt +++ b/tests/bson-corpus/int32-valid-005.phpt @@ -13,33 +13,18 @@ $canonicalBson = hex2bin('0C0000001069000100000000'); $canonicalExtJson = '{"i" : {"$numberInt": "1"}}'; $relaxedExtJson = '{"i" : 1}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical BSON -> Relaxed extJSON -echo json_canonicalize(toRelaxedExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Relaxed extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toRelaxedExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Relaxed extJSON -> BSON -> Relaxed extJSON -echo json_canonicalize(toRelaxedExtendedJSON(fromJSON($relaxedExtJson))), "\n"; - // Relaxed extJSON -> BSON object -> Relaxed extJSON echo json_canonicalize(MongoDB\BSON\Document::fromJSON($relaxedExtJson)->toRelaxedExtendedJSON()), "\n"; @@ -48,13 +33,8 @@ echo json_canonicalize(MongoDB\BSON\Document::fromJSON($relaxedExtJson)->toRelax --EXPECT-- 0c0000001069000100000000 -0c0000001069000100000000 -{"i":{"$numberInt":"1"}} {"i":{"$numberInt":"1"}} {"i":1} -{"i":1} 0c0000001069000100000000 -0c0000001069000100000000 -{"i":1} {"i":1} ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/int64-decodeError-001.phpt b/tests/bson-corpus/int64-decodeError-001.phpt index 1d79612eb..ff96384bf 100644 --- a/tests/bson-corpus/int64-decodeError-001.phpt +++ b/tests/bson-corpus/int64-decodeError-001.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('0C0000001261001234567800'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/int64-valid-001.phpt b/tests/bson-corpus/int64-valid-001.phpt index 13c95b4d1..a5138a649 100644 --- a/tests/bson-corpus/int64-valid-001.phpt +++ b/tests/bson-corpus/int64-valid-001.phpt @@ -15,33 +15,18 @@ $canonicalBson = hex2bin('10000000126100000000000000008000'); $canonicalExtJson = '{"a" : {"$numberLong" : "-9223372036854775808"}}'; $relaxedExtJson = '{"a" : -9223372036854775808}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical BSON -> Relaxed extJSON -echo json_canonicalize(toRelaxedExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Relaxed extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toRelaxedExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Relaxed extJSON -> BSON -> Relaxed extJSON -echo json_canonicalize(toRelaxedExtendedJSON(fromJSON($relaxedExtJson))), "\n"; - // Relaxed extJSON -> BSON object -> Relaxed extJSON echo json_canonicalize(MongoDB\BSON\Document::fromJSON($relaxedExtJson)->toRelaxedExtendedJSON()), "\n"; @@ -50,13 +35,8 @@ echo json_canonicalize(MongoDB\BSON\Document::fromJSON($relaxedExtJson)->toRelax --EXPECT-- 10000000126100000000000000008000 -10000000126100000000000000008000 -{"a":{"$numberLong":"-9223372036854775808"}} {"a":{"$numberLong":"-9223372036854775808"}} {"a":-9223372036854775808} -{"a":-9223372036854775808} 10000000126100000000000000008000 -10000000126100000000000000008000 -{"a":-9223372036854775808} {"a":-9223372036854775808} ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/int64-valid-002.phpt b/tests/bson-corpus/int64-valid-002.phpt index 16da3cd3f..eb2c10a52 100644 --- a/tests/bson-corpus/int64-valid-002.phpt +++ b/tests/bson-corpus/int64-valid-002.phpt @@ -15,33 +15,18 @@ $canonicalBson = hex2bin('10000000126100FFFFFFFFFFFFFF7F00'); $canonicalExtJson = '{"a" : {"$numberLong" : "9223372036854775807"}}'; $relaxedExtJson = '{"a" : 9223372036854775807}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical BSON -> Relaxed extJSON -echo json_canonicalize(toRelaxedExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Relaxed extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toRelaxedExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Relaxed extJSON -> BSON -> Relaxed extJSON -echo json_canonicalize(toRelaxedExtendedJSON(fromJSON($relaxedExtJson))), "\n"; - // Relaxed extJSON -> BSON object -> Relaxed extJSON echo json_canonicalize(MongoDB\BSON\Document::fromJSON($relaxedExtJson)->toRelaxedExtendedJSON()), "\n"; @@ -50,13 +35,8 @@ echo json_canonicalize(MongoDB\BSON\Document::fromJSON($relaxedExtJson)->toRelax --EXPECT-- 10000000126100ffffffffffffff7f00 -10000000126100ffffffffffffff7f00 -{"a":{"$numberLong":"9223372036854775807"}} {"a":{"$numberLong":"9223372036854775807"}} {"a":9223372036854775807} -{"a":9223372036854775807} 10000000126100ffffffffffffff7f00 -10000000126100ffffffffffffff7f00 -{"a":9223372036854775807} {"a":9223372036854775807} ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/int64-valid-003.phpt b/tests/bson-corpus/int64-valid-003.phpt index 0058b4361..887516dce 100644 --- a/tests/bson-corpus/int64-valid-003.phpt +++ b/tests/bson-corpus/int64-valid-003.phpt @@ -1,7 +1,5 @@ --TEST-- Int64 type: -1 ---XFAIL-- -PHP encodes integers as 32-bit if range allows --DESCRIPTION-- Generated by scripts/convert-bson-corpus-tests.php @@ -15,33 +13,18 @@ $canonicalBson = hex2bin('10000000126100FFFFFFFFFFFFFFFF00'); $canonicalExtJson = '{"a" : {"$numberLong" : "-1"}}'; $relaxedExtJson = '{"a" : -1}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical BSON -> Relaxed extJSON -echo json_canonicalize(toRelaxedExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Relaxed extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toRelaxedExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Relaxed extJSON -> BSON -> Relaxed extJSON -echo json_canonicalize(toRelaxedExtendedJSON(fromJSON($relaxedExtJson))), "\n"; - // Relaxed extJSON -> BSON object -> Relaxed extJSON echo json_canonicalize(MongoDB\BSON\Document::fromJSON($relaxedExtJson)->toRelaxedExtendedJSON()), "\n"; @@ -50,13 +33,8 @@ echo json_canonicalize(MongoDB\BSON\Document::fromJSON($relaxedExtJson)->toRelax --EXPECT-- 10000000126100ffffffffffffffff00 -10000000126100ffffffffffffffff00 -{"a":{"$numberLong":"-1"}} {"a":{"$numberLong":"-1"}} {"a":-1} -{"a":-1} 10000000126100ffffffffffffffff00 -10000000126100ffffffffffffffff00 -{"a":-1} {"a":-1} ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/int64-valid-004.phpt b/tests/bson-corpus/int64-valid-004.phpt index c04ba483e..ba8be362a 100644 --- a/tests/bson-corpus/int64-valid-004.phpt +++ b/tests/bson-corpus/int64-valid-004.phpt @@ -1,7 +1,5 @@ --TEST-- Int64 type: 0 ---XFAIL-- -PHP encodes integers as 32-bit if range allows --DESCRIPTION-- Generated by scripts/convert-bson-corpus-tests.php @@ -15,33 +13,18 @@ $canonicalBson = hex2bin('10000000126100000000000000000000'); $canonicalExtJson = '{"a" : {"$numberLong" : "0"}}'; $relaxedExtJson = '{"a" : 0}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical BSON -> Relaxed extJSON -echo json_canonicalize(toRelaxedExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Relaxed extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toRelaxedExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Relaxed extJSON -> BSON -> Relaxed extJSON -echo json_canonicalize(toRelaxedExtendedJSON(fromJSON($relaxedExtJson))), "\n"; - // Relaxed extJSON -> BSON object -> Relaxed extJSON echo json_canonicalize(MongoDB\BSON\Document::fromJSON($relaxedExtJson)->toRelaxedExtendedJSON()), "\n"; @@ -50,13 +33,8 @@ echo json_canonicalize(MongoDB\BSON\Document::fromJSON($relaxedExtJson)->toRelax --EXPECT-- 10000000126100000000000000000000 -10000000126100000000000000000000 -{"a":{"$numberLong":"0"}} {"a":{"$numberLong":"0"}} {"a":0} -{"a":0} 10000000126100000000000000000000 -10000000126100000000000000000000 -{"a":0} {"a":0} ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/int64-valid-005.phpt b/tests/bson-corpus/int64-valid-005.phpt index 215933040..1080f47ab 100644 --- a/tests/bson-corpus/int64-valid-005.phpt +++ b/tests/bson-corpus/int64-valid-005.phpt @@ -1,7 +1,5 @@ --TEST-- Int64 type: 1 ---XFAIL-- -PHP encodes integers as 32-bit if range allows --DESCRIPTION-- Generated by scripts/convert-bson-corpus-tests.php @@ -15,33 +13,18 @@ $canonicalBson = hex2bin('10000000126100010000000000000000'); $canonicalExtJson = '{"a" : {"$numberLong" : "1"}}'; $relaxedExtJson = '{"a" : 1}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical BSON -> Relaxed extJSON -echo json_canonicalize(toRelaxedExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Relaxed extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toRelaxedExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Relaxed extJSON -> BSON -> Relaxed extJSON -echo json_canonicalize(toRelaxedExtendedJSON(fromJSON($relaxedExtJson))), "\n"; - // Relaxed extJSON -> BSON object -> Relaxed extJSON echo json_canonicalize(MongoDB\BSON\Document::fromJSON($relaxedExtJson)->toRelaxedExtendedJSON()), "\n"; @@ -50,13 +33,8 @@ echo json_canonicalize(MongoDB\BSON\Document::fromJSON($relaxedExtJson)->toRelax --EXPECT-- 10000000126100010000000000000000 -10000000126100010000000000000000 -{"a":{"$numberLong":"1"}} {"a":{"$numberLong":"1"}} {"a":1} -{"a":1} 10000000126100010000000000000000 -10000000126100010000000000000000 -{"a":1} {"a":1} ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/maxkey-valid-001.phpt b/tests/bson-corpus/maxkey-valid-001.phpt index f7be328a2..60ccc5adf 100644 --- a/tests/bson-corpus/maxkey-valid-001.phpt +++ b/tests/bson-corpus/maxkey-valid-001.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('080000007F610000'); $canonicalExtJson = '{"a" : {"$maxKey" : 1}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 080000007f610000 -080000007f610000 -{"a":{"$maxKey":1}} {"a":{"$maxKey":1}} 080000007f610000 -080000007f610000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/minkey-valid-001.phpt b/tests/bson-corpus/minkey-valid-001.phpt index f8b825b02..f2fa8622a 100644 --- a/tests/bson-corpus/minkey-valid-001.phpt +++ b/tests/bson-corpus/minkey-valid-001.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('08000000FF610000'); $canonicalExtJson = '{"a" : {"$minKey" : 1}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 08000000ff610000 -08000000ff610000 -{"a":{"$minKey":1}} {"a":{"$minKey":1}} 08000000ff610000 -08000000ff610000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/multi-type-deprecated-valid-001.phpt b/tests/bson-corpus/multi-type-deprecated-valid-001.phpt index b6829347c..486e9afae 100644 --- a/tests/bson-corpus/multi-type-deprecated-valid-001.phpt +++ b/tests/bson-corpus/multi-type-deprecated-valid-001.phpt @@ -1,7 +1,5 @@ --TEST-- Multiple types within the same document: All BSON types ---XFAIL-- -PHP encodes integers as 32-bit if range allows --DESCRIPTION-- Generated by scripts/convert-bson-corpus-tests.php @@ -16,21 +14,12 @@ $convertedBson = hex2bin('48020000075f69640057e193d7a9cc81b4027498b50253796d626f $canonicalExtJson = '{"_id": {"$oid": "57e193d7a9cc81b4027498b5"}, "Symbol": {"$symbol": "symbol"}, "String": "string", "Int32": {"$numberInt": "42"}, "Int64": {"$numberLong": "42"}, "Double": {"$numberDouble": "-1.0"}, "Binary": { "$binary" : {"base64": "o0w498Or7cijeBSpkquNtg==", "subType": "03"}}, "BinaryUserDefined": { "$binary" : {"base64": "AQIDBAU=", "subType": "80"}}, "Code": {"$code": "function() {}"}, "CodeWithScope": {"$code": "function() {}", "$scope": {}}, "Subdocument": {"foo": "bar"}, "Array": [{"$numberInt": "1"}, {"$numberInt": "2"}, {"$numberInt": "3"}, {"$numberInt": "4"}, {"$numberInt": "5"}], "Timestamp": {"$timestamp": {"t": 42, "i": 1}}, "Regex": {"$regularExpression": {"pattern": "pattern", "options": ""}}, "DatetimeEpoch": {"$date": {"$numberLong": "0"}}, "DatetimePositive": {"$date": {"$numberLong": "2147483647"}}, "DatetimeNegative": {"$date": {"$numberLong": "-2147483648"}}, "True": true, "False": false, "DBPointer": {"$dbPointer": {"$ref": "collection", "$id": {"$oid": "57e193d7a9cc81b4027498b1"}}}, "DBRef": {"$ref": "collection", "$id": {"$oid": "57fd71e96e32ab4225b723fb"}, "$db": "database"}, "Minkey": {"$minKey": 1}, "Maxkey": {"$maxKey": 1}, "Null": null, "Undefined": {"$undefined": true}}'; $convertedExtJson = '{"_id": {"$oid": "57e193d7a9cc81b4027498b5"}, "Symbol": "symbol", "String": "string", "Int32": {"$numberInt": "42"}, "Int64": {"$numberLong": "42"}, "Double": {"$numberDouble": "-1.0"}, "Binary": { "$binary" : {"base64": "o0w498Or7cijeBSpkquNtg==", "subType": "03"}}, "BinaryUserDefined": { "$binary" : {"base64": "AQIDBAU=", "subType": "80"}}, "Code": {"$code": "function() {}"}, "CodeWithScope": {"$code": "function() {}", "$scope": {}}, "Subdocument": {"foo": "bar"}, "Array": [{"$numberInt": "1"}, {"$numberInt": "2"}, {"$numberInt": "3"}, {"$numberInt": "4"}, {"$numberInt": "5"}], "Timestamp": {"$timestamp": {"t": 42, "i": 1}}, "Regex": {"$regularExpression": {"pattern": "pattern", "options": ""}}, "DatetimeEpoch": {"$date": {"$numberLong": "0"}}, "DatetimePositive": {"$date": {"$numberLong": "2147483647"}}, "DatetimeNegative": {"$date": {"$numberLong": "-2147483648"}}, "True": true, "False": false, "DBPointer": {"$ref": "collection", "$id": {"$oid": "57e193d7a9cc81b4027498b1"}}, "DBRef": {"$ref": "collection", "$id": {"$oid": "57fd71e96e32ab4225b723fb"}, "$db": "database"}, "Minkey": {"$minKey": 1}, "Maxkey": {"$maxKey": 1}, "Null": null, "Undefined": null}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -39,9 +28,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 38020000075f69640057e193d7a9cc81b4027498b50e53796d626f6c000700000073796d626f6c0002537472696e670007000000737472696e670010496e743332002a00000012496e743634002a0000000000000001446f75626c6500000000000000f0bf0542696e617279001000000003a34c38f7c3abedc8a37814a992ab8db60542696e61727955736572446566696e656400050000008001020304050d436f6465000e00000066756e6374696f6e2829207b7d000f436f64655769746853636f7065001b0000000e00000066756e6374696f6e2829207b7d00050000000003537562646f63756d656e74001200000002666f6f0004000000626172000004417272617900280000001030000100000010310002000000103200030000001033000400000010340005000000001154696d657374616d7000010000002a0000000b5265676578007061747465726e0000094461746574696d6545706f6368000000000000000000094461746574696d65506f73697469766500ffffff7f00000000094461746574696d654e656761746976650000000080ffffffff085472756500010846616c736500000c4442506f696e746572000b000000636f6c6c656374696f6e0057e193d7a9cc81b4027498b1034442526566003d0000000224726566000b000000636f6c6c656374696f6e00072469640057fd71e96e32ab4225b723fb02246462000900000064617461626173650000ff4d696e6b6579007f4d61786b6579000a4e756c6c0006556e646566696e65640000 -38020000075f69640057e193d7a9cc81b4027498b50e53796d626f6c000700000073796d626f6c0002537472696e670007000000737472696e670010496e743332002a00000012496e743634002a0000000000000001446f75626c6500000000000000f0bf0542696e617279001000000003a34c38f7c3abedc8a37814a992ab8db60542696e61727955736572446566696e656400050000008001020304050d436f6465000e00000066756e6374696f6e2829207b7d000f436f64655769746853636f7065001b0000000e00000066756e6374696f6e2829207b7d00050000000003537562646f63756d656e74001200000002666f6f0004000000626172000004417272617900280000001030000100000010310002000000103200030000001033000400000010340005000000001154696d657374616d7000010000002a0000000b5265676578007061747465726e0000094461746574696d6545706f6368000000000000000000094461746574696d65506f73697469766500ffffff7f00000000094461746574696d654e656761746976650000000080ffffffff085472756500010846616c736500000c4442506f696e746572000b000000636f6c6c656374696f6e0057e193d7a9cc81b4027498b1034442526566003d0000000224726566000b000000636f6c6c656374696f6e00072469640057fd71e96e32ab4225b723fb02246462000900000064617461626173650000ff4d696e6b6579007f4d61786b6579000a4e756c6c0006556e646566696e65640000 -{"_id":{"$oid":"57e193d7a9cc81b4027498b5"},"Symbol":{"$symbol":"symbol"},"String":"string","Int32":{"$numberInt":"42"},"Int64":{"$numberLong":"42"},"Double":{"$numberDouble":"-1"},"Binary":{"$binary":{"base64":"o0w498Or7cijeBSpkquNtg==","subType":"03"}},"BinaryUserDefined":{"$binary":{"base64":"AQIDBAU=","subType":"80"}},"Code":{"$code":"function() {}"},"CodeWithScope":{"$code":"function() {}","$scope":{}},"Subdocument":{"foo":"bar"},"Array":[{"$numberInt":"1"},{"$numberInt":"2"},{"$numberInt":"3"},{"$numberInt":"4"},{"$numberInt":"5"}],"Timestamp":{"$timestamp":{"t":42,"i":1}},"Regex":{"$regularExpression":{"pattern":"pattern","options":""}},"DatetimeEpoch":{"$date":{"$numberLong":"0"}},"DatetimePositive":{"$date":{"$numberLong":"2147483647"}},"DatetimeNegative":{"$date":{"$numberLong":"-2147483648"}},"True":true,"False":false,"DBPointer":{"$dbPointer":{"$ref":"collection","$id":{"$oid":"57e193d7a9cc81b4027498b1"}}},"DBRef":{"$ref":"collection","$id":{"$oid":"57fd71e96e32ab4225b723fb"},"$db":"database"},"Minkey":{"$minKey":1},"Maxkey":{"$maxKey":1},"Null":null,"Undefined":{"$undefined":true}} {"_id":{"$oid":"57e193d7a9cc81b4027498b5"},"Symbol":{"$symbol":"symbol"},"String":"string","Int32":{"$numberInt":"42"},"Int64":{"$numberLong":"42"},"Double":{"$numberDouble":"-1"},"Binary":{"$binary":{"base64":"o0w498Or7cijeBSpkquNtg==","subType":"03"}},"BinaryUserDefined":{"$binary":{"base64":"AQIDBAU=","subType":"80"}},"Code":{"$code":"function() {}"},"CodeWithScope":{"$code":"function() {}","$scope":{}},"Subdocument":{"foo":"bar"},"Array":[{"$numberInt":"1"},{"$numberInt":"2"},{"$numberInt":"3"},{"$numberInt":"4"},{"$numberInt":"5"}],"Timestamp":{"$timestamp":{"t":42,"i":1}},"Regex":{"$regularExpression":{"pattern":"pattern","options":""}},"DatetimeEpoch":{"$date":{"$numberLong":"0"}},"DatetimePositive":{"$date":{"$numberLong":"2147483647"}},"DatetimeNegative":{"$date":{"$numberLong":"-2147483648"}},"True":true,"False":false,"DBPointer":{"$dbPointer":{"$ref":"collection","$id":{"$oid":"57e193d7a9cc81b4027498b1"}}},"DBRef":{"$ref":"collection","$id":{"$oid":"57fd71e96e32ab4225b723fb"},"$db":"database"},"Minkey":{"$minKey":1},"Maxkey":{"$maxKey":1},"Null":null,"Undefined":{"$undefined":true}} 38020000075f69640057e193d7a9cc81b4027498b50e53796d626f6c000700000073796d626f6c0002537472696e670007000000737472696e670010496e743332002a00000012496e743634002a0000000000000001446f75626c6500000000000000f0bf0542696e617279001000000003a34c38f7c3abedc8a37814a992ab8db60542696e61727955736572446566696e656400050000008001020304050d436f6465000e00000066756e6374696f6e2829207b7d000f436f64655769746853636f7065001b0000000e00000066756e6374696f6e2829207b7d00050000000003537562646f63756d656e74001200000002666f6f0004000000626172000004417272617900280000001030000100000010310002000000103200030000001033000400000010340005000000001154696d657374616d7000010000002a0000000b5265676578007061747465726e0000094461746574696d6545706f6368000000000000000000094461746574696d65506f73697469766500ffffff7f00000000094461746574696d654e656761746976650000000080ffffffff085472756500010846616c736500000c4442506f696e746572000b000000636f6c6c656374696f6e0057e193d7a9cc81b4027498b1034442526566003d0000000224726566000b000000636f6c6c656374696f6e00072469640057fd71e96e32ab4225b723fb02246462000900000064617461626173650000ff4d696e6b6579007f4d61786b6579000a4e756c6c0006556e646566696e65640000 -38020000075f69640057e193d7a9cc81b4027498b50e53796d626f6c000700000073796d626f6c0002537472696e670007000000737472696e670010496e743332002a00000012496e743634002a0000000000000001446f75626c6500000000000000f0bf0542696e617279001000000003a34c38f7c3abedc8a37814a992ab8db60542696e61727955736572446566696e656400050000008001020304050d436f6465000e00000066756e6374696f6e2829207b7d000f436f64655769746853636f7065001b0000000e00000066756e6374696f6e2829207b7d00050000000003537562646f63756d656e74001200000002666f6f0004000000626172000004417272617900280000001030000100000010310002000000103200030000001033000400000010340005000000001154696d657374616d7000010000002a0000000b5265676578007061747465726e0000094461746574696d6545706f6368000000000000000000094461746574696d65506f73697469766500ffffff7f00000000094461746574696d654e656761746976650000000080ffffffff085472756500010846616c736500000c4442506f696e746572000b000000636f6c6c656374696f6e0057e193d7a9cc81b4027498b1034442526566003d0000000224726566000b000000636f6c6c656374696f6e00072469640057fd71e96e32ab4225b723fb02246462000900000064617461626173650000ff4d696e6b6579007f4d61786b6579000a4e756c6c0006556e646566696e65640000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/multi-type-valid-001.phpt b/tests/bson-corpus/multi-type-valid-001.phpt index 6b88f76d3..764c589ce 100644 --- a/tests/bson-corpus/multi-type-valid-001.phpt +++ b/tests/bson-corpus/multi-type-valid-001.phpt @@ -1,7 +1,5 @@ --TEST-- Multiple types within the same document: All BSON types ---XFAIL-- -PHP encodes integers as 32-bit if range allows --DESCRIPTION-- Generated by scripts/convert-bson-corpus-tests.php @@ -14,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('F4010000075F69640057E193D7A9CC81B4027498B502537472696E670007000000737472696E670010496E743332002A00000012496E743634002A0000000000000001446F75626C6500000000000000F0BF0542696E617279001000000003A34C38F7C3ABEDC8A37814A992AB8DB60542696E61727955736572446566696E656400050000008001020304050D436F6465000E00000066756E6374696F6E2829207B7D000F436F64655769746853636F7065001B0000000E00000066756E6374696F6E2829207B7D00050000000003537562646F63756D656E74001200000002666F6F0004000000626172000004417272617900280000001030000100000010310002000000103200030000001033000400000010340005000000001154696D657374616D7000010000002A0000000B5265676578007061747465726E0000094461746574696D6545706F6368000000000000000000094461746574696D65506F73697469766500FFFFFF7F00000000094461746574696D654E656761746976650000000080FFFFFFFF085472756500010846616C73650000034442526566003D0000000224726566000B000000636F6C6C656374696F6E00072469640057FD71E96E32AB4225B723FB02246462000900000064617461626173650000FF4D696E6B6579007F4D61786B6579000A4E756C6C0000'); $canonicalExtJson = '{"_id": {"$oid": "57e193d7a9cc81b4027498b5"}, "String": "string", "Int32": {"$numberInt": "42"}, "Int64": {"$numberLong": "42"}, "Double": {"$numberDouble": "-1.0"}, "Binary": { "$binary" : {"base64": "o0w498Or7cijeBSpkquNtg==", "subType": "03"}}, "BinaryUserDefined": { "$binary" : {"base64": "AQIDBAU=", "subType": "80"}}, "Code": {"$code": "function() {}"}, "CodeWithScope": {"$code": "function() {}", "$scope": {}}, "Subdocument": {"foo": "bar"}, "Array": [{"$numberInt": "1"}, {"$numberInt": "2"}, {"$numberInt": "3"}, {"$numberInt": "4"}, {"$numberInt": "5"}], "Timestamp": {"$timestamp": {"t": 42, "i": 1}}, "Regex": {"$regularExpression": {"pattern": "pattern", "options": ""}}, "DatetimeEpoch": {"$date": {"$numberLong": "0"}}, "DatetimePositive": {"$date": {"$numberLong": "2147483647"}}, "DatetimeNegative": {"$date": {"$numberLong": "-2147483648"}}, "True": true, "False": false, "DBRef": {"$ref": "collection", "$id": {"$oid": "57fd71e96e32ab4225b723fb"}, "$db": "database"}, "Minkey": {"$minKey": 1}, "Maxkey": {"$maxKey": 1}, "Null": null}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -37,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- f4010000075f69640057e193d7a9cc81b4027498b502537472696e670007000000737472696e670010496e743332002a00000012496e743634002a0000000000000001446f75626c6500000000000000f0bf0542696e617279001000000003a34c38f7c3abedc8a37814a992ab8db60542696e61727955736572446566696e656400050000008001020304050d436f6465000e00000066756e6374696f6e2829207b7d000f436f64655769746853636f7065001b0000000e00000066756e6374696f6e2829207b7d00050000000003537562646f63756d656e74001200000002666f6f0004000000626172000004417272617900280000001030000100000010310002000000103200030000001033000400000010340005000000001154696d657374616d7000010000002a0000000b5265676578007061747465726e0000094461746574696d6545706f6368000000000000000000094461746574696d65506f73697469766500ffffff7f00000000094461746574696d654e656761746976650000000080ffffffff085472756500010846616c73650000034442526566003d0000000224726566000b000000636f6c6c656374696f6e00072469640057fd71e96e32ab4225b723fb02246462000900000064617461626173650000ff4d696e6b6579007f4d61786b6579000a4e756c6c0000 -f4010000075f69640057e193d7a9cc81b4027498b502537472696e670007000000737472696e670010496e743332002a00000012496e743634002a0000000000000001446f75626c6500000000000000f0bf0542696e617279001000000003a34c38f7c3abedc8a37814a992ab8db60542696e61727955736572446566696e656400050000008001020304050d436f6465000e00000066756e6374696f6e2829207b7d000f436f64655769746853636f7065001b0000000e00000066756e6374696f6e2829207b7d00050000000003537562646f63756d656e74001200000002666f6f0004000000626172000004417272617900280000001030000100000010310002000000103200030000001033000400000010340005000000001154696d657374616d7000010000002a0000000b5265676578007061747465726e0000094461746574696d6545706f6368000000000000000000094461746574696d65506f73697469766500ffffff7f00000000094461746574696d654e656761746976650000000080ffffffff085472756500010846616c73650000034442526566003d0000000224726566000b000000636f6c6c656374696f6e00072469640057fd71e96e32ab4225b723fb02246462000900000064617461626173650000ff4d696e6b6579007f4d61786b6579000a4e756c6c0000 -{"_id":{"$oid":"57e193d7a9cc81b4027498b5"},"String":"string","Int32":{"$numberInt":"42"},"Int64":{"$numberLong":"42"},"Double":{"$numberDouble":"-1"},"Binary":{"$binary":{"base64":"o0w498Or7cijeBSpkquNtg==","subType":"03"}},"BinaryUserDefined":{"$binary":{"base64":"AQIDBAU=","subType":"80"}},"Code":{"$code":"function() {}"},"CodeWithScope":{"$code":"function() {}","$scope":{}},"Subdocument":{"foo":"bar"},"Array":[{"$numberInt":"1"},{"$numberInt":"2"},{"$numberInt":"3"},{"$numberInt":"4"},{"$numberInt":"5"}],"Timestamp":{"$timestamp":{"t":42,"i":1}},"Regex":{"$regularExpression":{"pattern":"pattern","options":""}},"DatetimeEpoch":{"$date":{"$numberLong":"0"}},"DatetimePositive":{"$date":{"$numberLong":"2147483647"}},"DatetimeNegative":{"$date":{"$numberLong":"-2147483648"}},"True":true,"False":false,"DBRef":{"$ref":"collection","$id":{"$oid":"57fd71e96e32ab4225b723fb"},"$db":"database"},"Minkey":{"$minKey":1},"Maxkey":{"$maxKey":1},"Null":null} {"_id":{"$oid":"57e193d7a9cc81b4027498b5"},"String":"string","Int32":{"$numberInt":"42"},"Int64":{"$numberLong":"42"},"Double":{"$numberDouble":"-1"},"Binary":{"$binary":{"base64":"o0w498Or7cijeBSpkquNtg==","subType":"03"}},"BinaryUserDefined":{"$binary":{"base64":"AQIDBAU=","subType":"80"}},"Code":{"$code":"function() {}"},"CodeWithScope":{"$code":"function() {}","$scope":{}},"Subdocument":{"foo":"bar"},"Array":[{"$numberInt":"1"},{"$numberInt":"2"},{"$numberInt":"3"},{"$numberInt":"4"},{"$numberInt":"5"}],"Timestamp":{"$timestamp":{"t":42,"i":1}},"Regex":{"$regularExpression":{"pattern":"pattern","options":""}},"DatetimeEpoch":{"$date":{"$numberLong":"0"}},"DatetimePositive":{"$date":{"$numberLong":"2147483647"}},"DatetimeNegative":{"$date":{"$numberLong":"-2147483648"}},"True":true,"False":false,"DBRef":{"$ref":"collection","$id":{"$oid":"57fd71e96e32ab4225b723fb"},"$db":"database"},"Minkey":{"$minKey":1},"Maxkey":{"$maxKey":1},"Null":null} f4010000075f69640057e193d7a9cc81b4027498b502537472696e670007000000737472696e670010496e743332002a00000012496e743634002a0000000000000001446f75626c6500000000000000f0bf0542696e617279001000000003a34c38f7c3abedc8a37814a992ab8db60542696e61727955736572446566696e656400050000008001020304050d436f6465000e00000066756e6374696f6e2829207b7d000f436f64655769746853636f7065001b0000000e00000066756e6374696f6e2829207b7d00050000000003537562646f63756d656e74001200000002666f6f0004000000626172000004417272617900280000001030000100000010310002000000103200030000001033000400000010340005000000001154696d657374616d7000010000002a0000000b5265676578007061747465726e0000094461746574696d6545706f6368000000000000000000094461746574696d65506f73697469766500ffffff7f00000000094461746574696d654e656761746976650000000080ffffffff085472756500010846616c73650000034442526566003d0000000224726566000b000000636f6c6c656374696f6e00072469640057fd71e96e32ab4225b723fb02246462000900000064617461626173650000ff4d696e6b6579007f4d61786b6579000a4e756c6c0000 -f4010000075f69640057e193d7a9cc81b4027498b502537472696e670007000000737472696e670010496e743332002a00000012496e743634002a0000000000000001446f75626c6500000000000000f0bf0542696e617279001000000003a34c38f7c3abedc8a37814a992ab8db60542696e61727955736572446566696e656400050000008001020304050d436f6465000e00000066756e6374696f6e2829207b7d000f436f64655769746853636f7065001b0000000e00000066756e6374696f6e2829207b7d00050000000003537562646f63756d656e74001200000002666f6f0004000000626172000004417272617900280000001030000100000010310002000000103200030000001033000400000010340005000000001154696d657374616d7000010000002a0000000b5265676578007061747465726e0000094461746574696d6545706f6368000000000000000000094461746574696d65506f73697469766500ffffff7f00000000094461746574696d654e656761746976650000000080ffffffff085472756500010846616c73650000034442526566003d0000000224726566000b000000636f6c6c656374696f6e00072469640057fd71e96e32ab4225b723fb02246462000900000064617461626173650000ff4d696e6b6579007f4d61786b6579000a4e756c6c0000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/null-valid-001.phpt b/tests/bson-corpus/null-valid-001.phpt index 6a27bf352..442da7302 100644 --- a/tests/bson-corpus/null-valid-001.phpt +++ b/tests/bson-corpus/null-valid-001.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('080000000A610000'); $canonicalExtJson = '{"a" : null}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 080000000a610000 -080000000a610000 -{"a":null} {"a":null} 080000000a610000 -080000000a610000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/oid-decodeError-001.phpt b/tests/bson-corpus/oid-decodeError-001.phpt index 981f3cb16..9301faf2b 100644 --- a/tests/bson-corpus/oid-decodeError-001.phpt +++ b/tests/bson-corpus/oid-decodeError-001.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('1200000007610056E1FC72E0C917E9C471'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/oid-valid-001.phpt b/tests/bson-corpus/oid-valid-001.phpt index 842d58e3e..c1b214e34 100644 --- a/tests/bson-corpus/oid-valid-001.phpt +++ b/tests/bson-corpus/oid-valid-001.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1400000007610000000000000000000000000000'); $canonicalExtJson = '{"a" : {"$oid" : "000000000000000000000000"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1400000007610000000000000000000000000000 -1400000007610000000000000000000000000000 -{"a":{"$oid":"000000000000000000000000"}} {"a":{"$oid":"000000000000000000000000"}} 1400000007610000000000000000000000000000 -1400000007610000000000000000000000000000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/oid-valid-002.phpt b/tests/bson-corpus/oid-valid-002.phpt index 3a7a268ca..0e0bdd307 100644 --- a/tests/bson-corpus/oid-valid-002.phpt +++ b/tests/bson-corpus/oid-valid-002.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('14000000076100FFFFFFFFFFFFFFFFFFFFFFFF00'); $canonicalExtJson = '{"a" : {"$oid" : "ffffffffffffffffffffffff"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 14000000076100ffffffffffffffffffffffff00 -14000000076100ffffffffffffffffffffffff00 -{"a":{"$oid":"ffffffffffffffffffffffff"}} {"a":{"$oid":"ffffffffffffffffffffffff"}} 14000000076100ffffffffffffffffffffffff00 -14000000076100ffffffffffffffffffffffff00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/oid-valid-003.phpt b/tests/bson-corpus/oid-valid-003.phpt index 95f173538..c90ec3c7e 100644 --- a/tests/bson-corpus/oid-valid-003.phpt +++ b/tests/bson-corpus/oid-valid-003.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1400000007610056E1FC72E0C917E9C471416100'); $canonicalExtJson = '{"a" : {"$oid" : "56e1fc72e0c917e9c4714161"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1400000007610056e1fc72e0c917e9c471416100 -1400000007610056e1fc72e0c917e9c471416100 -{"a":{"$oid":"56e1fc72e0c917e9c4714161"}} {"a":{"$oid":"56e1fc72e0c917e9c4714161"}} 1400000007610056e1fc72e0c917e9c471416100 -1400000007610056e1fc72e0c917e9c471416100 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/regex-decodeError-001.phpt b/tests/bson-corpus/regex-decodeError-001.phpt index 0f5006219..d9cdbc800 100644 --- a/tests/bson-corpus/regex-decodeError-001.phpt +++ b/tests/bson-corpus/regex-decodeError-001.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('0F0000000B610061006300696D0000'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/regex-decodeError-002.phpt b/tests/bson-corpus/regex-decodeError-002.phpt index 1db421e56..9244d55af 100644 --- a/tests/bson-corpus/regex-decodeError-002.phpt +++ b/tests/bson-corpus/regex-decodeError-002.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('100000000B61006162630069006D0000'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/regex-valid-001.phpt b/tests/bson-corpus/regex-valid-001.phpt index d6d20f501..03f98fdc6 100644 --- a/tests/bson-corpus/regex-valid-001.phpt +++ b/tests/bson-corpus/regex-valid-001.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('0A0000000B6100000000'); $canonicalExtJson = '{"a" : {"$regularExpression" : { "pattern": "", "options" : ""}}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 0a0000000b6100000000 -0a0000000b6100000000 -{"a":{"$regularExpression":{"pattern":"","options":""}}} {"a":{"$regularExpression":{"pattern":"","options":""}}} 0a0000000b6100000000 -0a0000000b6100000000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/regex-valid-002.phpt b/tests/bson-corpus/regex-valid-002.phpt index 191587846..1ad75ccec 100644 --- a/tests/bson-corpus/regex-valid-002.phpt +++ b/tests/bson-corpus/regex-valid-002.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('0D0000000B6100616263000000'); $canonicalExtJson = '{"a" : {"$regularExpression" : { "pattern": "abc", "options" : ""}}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 0d0000000b6100616263000000 -0d0000000b6100616263000000 -{"a":{"$regularExpression":{"pattern":"abc","options":""}}} {"a":{"$regularExpression":{"pattern":"abc","options":""}}} 0d0000000b6100616263000000 -0d0000000b6100616263000000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/regex-valid-003.phpt b/tests/bson-corpus/regex-valid-003.phpt index f312fa986..f557d1fec 100644 --- a/tests/bson-corpus/regex-valid-003.phpt +++ b/tests/bson-corpus/regex-valid-003.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('0F0000000B610061626300696D0000'); $canonicalExtJson = '{"a" : {"$regularExpression" : { "pattern": "abc", "options" : "im"}}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 0f0000000b610061626300696d0000 -0f0000000b610061626300696d0000 -{"a":{"$regularExpression":{"pattern":"abc","options":"im"}}} {"a":{"$regularExpression":{"pattern":"abc","options":"im"}}} 0f0000000b610061626300696d0000 -0f0000000b610061626300696d0000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/regex-valid-004.phpt b/tests/bson-corpus/regex-valid-004.phpt index 70ebb64f4..c253f6660 100644 --- a/tests/bson-corpus/regex-valid-004.phpt +++ b/tests/bson-corpus/regex-valid-004.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('0F0000000B610061626300696D0000'); $canonicalExtJson = '{"a" : {"$regularExpression" : { "pattern": "abc", "options" : "im"}}}'; $degenerateExtJson = '{"a" : {"$regularExpression" : {"options" : "im", "pattern": "abc"}}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 0f0000000b610061626300696d0000 -0f0000000b610061626300696d0000 -{"a":{"$regularExpression":{"pattern":"abc","options":"im"}}} {"a":{"$regularExpression":{"pattern":"abc","options":"im"}}} 0f0000000b610061626300696d0000 0f0000000b610061626300696d0000 -0f0000000b610061626300696d0000 -0f0000000b610061626300696d0000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/regex-valid-005.phpt b/tests/bson-corpus/regex-valid-005.phpt index 7362b459e..b346bcddb 100644 --- a/tests/bson-corpus/regex-valid-005.phpt +++ b/tests/bson-corpus/regex-valid-005.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('110000000B610061622F636400696D0000'); $canonicalExtJson = '{"a" : {"$regularExpression" : { "pattern": "ab/cd", "options" : "im"}}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 110000000b610061622f636400696d0000 -110000000b610061622f636400696d0000 -{"a":{"$regularExpression":{"pattern":"ab\/cd","options":"im"}}} {"a":{"$regularExpression":{"pattern":"ab\/cd","options":"im"}}} 110000000b610061622f636400696d0000 -110000000b610061622f636400696d0000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/regex-valid-006.phpt b/tests/bson-corpus/regex-valid-006.phpt index 15fbea18d..ca1c43e42 100644 --- a/tests/bson-corpus/regex-valid-006.phpt +++ b/tests/bson-corpus/regex-valid-006.phpt @@ -14,39 +14,21 @@ $degenerateBson = hex2bin('100000000B6100616263006D69780000'); $canonicalExtJson = '{"a" : {"$regularExpression" : { "pattern": "abc", "options" : "imx"}}}'; $degenerateExtJson = '{"a" : {"$regularExpression" : { "pattern": "abc", "options" : "mix"}}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($degenerateBson))), "\n"; - // Degenerate BSON -> BSON object -> Canonical BSON -echo bin2hex(fromPHP(MongoDB\BSON\Document::fromBSON($degenerateBson)->toPHP())), "\n"; - -// Degenerate BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($degenerateBson)), "\n"; +echo bin2hex((string) MongoDB\BSON\Document::fromPHP(MongoDB\BSON\Document::fromBSON($degenerateBson)->toPHP())), "\n"; // Degenerate BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($degenerateBson)->toCanonicalExtendedJSON()), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -55,15 +37,9 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 100000000b610061626300696d780000 -100000000b610061626300696d780000 -{"a":{"$regularExpression":{"pattern":"abc","options":"imx"}}} {"a":{"$regularExpression":{"pattern":"abc","options":"imx"}}} 100000000b610061626300696d780000 100000000b610061626300696d780000 -100000000b610061626300696d780000 -100000000b610061626300696d780000 -{"a":{"$regularExpression":{"pattern":"abc","options":"imx"}}} {"a":{"$regularExpression":{"pattern":"abc","options":"imx"}}} 100000000b610061626300696d780000 -100000000b610061626300696d780000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/regex-valid-007.phpt b/tests/bson-corpus/regex-valid-007.phpt index 21aa86489..66365091c 100644 --- a/tests/bson-corpus/regex-valid-007.phpt +++ b/tests/bson-corpus/regex-valid-007.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('100000000B610061625C226162000000'); $canonicalExtJson = '{"a" : {"$regularExpression" : { "pattern": "ab\\\\\\"ab", "options" : ""}}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 100000000b610061625c226162000000 -100000000b610061625c226162000000 -{"a":{"$regularExpression":{"pattern":"ab\\\"ab","options":""}}} {"a":{"$regularExpression":{"pattern":"ab\\\"ab","options":""}}} 100000000b610061625c226162000000 -100000000b610061625c226162000000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/regex-valid-008.phpt b/tests/bson-corpus/regex-valid-008.phpt index f2efddfee..43aa0327c 100644 --- a/tests/bson-corpus/regex-valid-008.phpt +++ b/tests/bson-corpus/regex-valid-008.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('180000000B247265676578007061747465726E0069780000'); $canonicalExtJson = '{"$regex" : {"$regularExpression" : { "pattern": "pattern", "options" : "ix"}}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 180000000b247265676578007061747465726e0069780000 -180000000b247265676578007061747465726e0069780000 -{"$regex":{"$regularExpression":{"pattern":"pattern","options":"ix"}}} {"$regex":{"$regularExpression":{"pattern":"pattern","options":"ix"}}} 180000000b247265676578007061747465726e0069780000 -180000000b247265676578007061747465726e0069780000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/regex-valid-009.phpt b/tests/bson-corpus/regex-valid-009.phpt index 59f5cd16d..d373b13be 100644 --- a/tests/bson-corpus/regex-valid-009.phpt +++ b/tests/bson-corpus/regex-valid-009.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('270000000B247265676578007061747465726E000002246F7074696F6E73000300000069780000'); $canonicalExtJson = '{"$regex" : {"$regularExpression" : { "pattern": "pattern", "options" : ""}}, "$options" : "ix"}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 270000000b247265676578007061747465726e000002246f7074696f6e73000300000069780000 -270000000b247265676578007061747465726e000002246f7074696f6e73000300000069780000 -{"$regex":{"$regularExpression":{"pattern":"pattern","options":""}},"$options":"ix"} {"$regex":{"$regularExpression":{"pattern":"pattern","options":""}},"$options":"ix"} 270000000b247265676578007061747465726e000002246f7074696f6e73000300000069780000 -270000000b247265676578007061747465726e000002246f7074696f6e73000300000069780000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/string-decodeError-001.phpt b/tests/bson-corpus/string-decodeError-001.phpt index 4a3ff662c..ebb05bdce 100644 --- a/tests/bson-corpus/string-decodeError-001.phpt +++ b/tests/bson-corpus/string-decodeError-001.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('0C0000000261000000000000'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/string-decodeError-002.phpt b/tests/bson-corpus/string-decodeError-002.phpt index 2773bd2dc..e28551803 100644 --- a/tests/bson-corpus/string-decodeError-002.phpt +++ b/tests/bson-corpus/string-decodeError-002.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('0C000000026100FFFFFFFF00'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/string-decodeError-003.phpt b/tests/bson-corpus/string-decodeError-003.phpt index 4403fa18c..ae71d0ed7 100644 --- a/tests/bson-corpus/string-decodeError-003.phpt +++ b/tests/bson-corpus/string-decodeError-003.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('10000000026100050000006200620000'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/string-decodeError-004.phpt b/tests/bson-corpus/string-decodeError-004.phpt index 437812322..0e5917195 100644 --- a/tests/bson-corpus/string-decodeError-004.phpt +++ b/tests/bson-corpus/string-decodeError-004.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('120000000200FFFFFF00666F6F6261720000'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/string-decodeError-005.phpt b/tests/bson-corpus/string-decodeError-005.phpt index e6ffcf2a8..aecab64d1 100644 --- a/tests/bson-corpus/string-decodeError-005.phpt +++ b/tests/bson-corpus/string-decodeError-005.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('1000000002610004000000616263FF00'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/string-decodeError-006.phpt b/tests/bson-corpus/string-decodeError-006.phpt index 2a4d19818..3a90dcb09 100644 --- a/tests/bson-corpus/string-decodeError-006.phpt +++ b/tests/bson-corpus/string-decodeError-006.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('0E00000002610001000000000000'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/string-decodeError-007.phpt b/tests/bson-corpus/string-decodeError-007.phpt index 5188d5df6..4ab19a106 100644 --- a/tests/bson-corpus/string-decodeError-007.phpt +++ b/tests/bson-corpus/string-decodeError-007.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('0E00000002610002000000E90000'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/string-valid-001.phpt b/tests/bson-corpus/string-valid-001.phpt index 9a7fb1d5c..d337844f1 100644 --- a/tests/bson-corpus/string-valid-001.phpt +++ b/tests/bson-corpus/string-valid-001.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('0D000000026100010000000000'); $canonicalExtJson = '{"a" : ""}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 0d000000026100010000000000 -0d000000026100010000000000 -{"a":""} {"a":""} 0d000000026100010000000000 -0d000000026100010000000000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/string-valid-002.phpt b/tests/bson-corpus/string-valid-002.phpt index 3462e6e4d..8aeb8ec7c 100644 --- a/tests/bson-corpus/string-valid-002.phpt +++ b/tests/bson-corpus/string-valid-002.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('0E00000002610002000000620000'); $canonicalExtJson = '{"a" : "b"}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 0e00000002610002000000620000 -0e00000002610002000000620000 -{"a":"b"} {"a":"b"} 0e00000002610002000000620000 -0e00000002610002000000620000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/string-valid-003.phpt b/tests/bson-corpus/string-valid-003.phpt index 875808dd5..09fd183bd 100644 --- a/tests/bson-corpus/string-valid-003.phpt +++ b/tests/bson-corpus/string-valid-003.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('190000000261000D0000006162616261626162616261620000'); $canonicalExtJson = '{"a" : "abababababab"}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 190000000261000d0000006162616261626162616261620000 -190000000261000d0000006162616261626162616261620000 -{"a":"abababababab"} {"a":"abababababab"} 190000000261000d0000006162616261626162616261620000 -190000000261000d0000006162616261626162616261620000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/string-valid-004.phpt b/tests/bson-corpus/string-valid-004.phpt index 3e35cb74d..d183d1134 100644 --- a/tests/bson-corpus/string-valid-004.phpt +++ b/tests/bson-corpus/string-valid-004.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('190000000261000D000000C3A9C3A9C3A9C3A9C3A9C3A90000'); $canonicalExtJson = '{"a" : "\\u00e9\\u00e9\\u00e9\\u00e9\\u00e9\\u00e9"}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 190000000261000d000000c3a9c3a9c3a9c3a9c3a9c3a90000 -190000000261000d000000c3a9c3a9c3a9c3a9c3a9c3a90000 -{"a":"\u00e9\u00e9\u00e9\u00e9\u00e9\u00e9"} {"a":"\u00e9\u00e9\u00e9\u00e9\u00e9\u00e9"} 190000000261000d000000c3a9c3a9c3a9c3a9c3a9c3a90000 -190000000261000d000000c3a9c3a9c3a9c3a9c3a9c3a90000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/string-valid-005.phpt b/tests/bson-corpus/string-valid-005.phpt index ea44b936e..414148e12 100644 --- a/tests/bson-corpus/string-valid-005.phpt +++ b/tests/bson-corpus/string-valid-005.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('190000000261000D000000E29886E29886E29886E298860000'); $canonicalExtJson = '{"a" : "\\u2606\\u2606\\u2606\\u2606"}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 190000000261000d000000e29886e29886e29886e298860000 -190000000261000d000000e29886e29886e29886e298860000 -{"a":"\u2606\u2606\u2606\u2606"} {"a":"\u2606\u2606\u2606\u2606"} 190000000261000d000000e29886e29886e29886e298860000 -190000000261000d000000e29886e29886e29886e298860000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/string-valid-006.phpt b/tests/bson-corpus/string-valid-006.phpt index 2d3bae85b..982619741 100644 --- a/tests/bson-corpus/string-valid-006.phpt +++ b/tests/bson-corpus/string-valid-006.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('190000000261000D0000006162006261620062616261620000'); $canonicalExtJson = '{"a" : "ab\\u0000bab\\u0000babab"}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 190000000261000d0000006162006261620062616261620000 -190000000261000d0000006162006261620062616261620000 -{"a":"ab\u0000bab\u0000babab"} {"a":"ab\u0000bab\u0000babab"} 190000000261000d0000006162006261620062616261620000 -190000000261000d0000006162006261620062616261620000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/string-valid-007.phpt b/tests/bson-corpus/string-valid-007.phpt index 7f56a0fc5..ba63c9ad8 100644 --- a/tests/bson-corpus/string-valid-007.phpt +++ b/tests/bson-corpus/string-valid-007.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('320000000261002600000061625C220102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F61620000'); $canonicalExtJson = '{"a":"ab\\\\\\"\\u0001\\u0002\\u0003\\u0004\\u0005\\u0006\\u0007\\b\\t\\n\\u000b\\f\\r\\u000e\\u000f\\u0010\\u0011\\u0012\\u0013\\u0014\\u0015\\u0016\\u0017\\u0018\\u0019\\u001a\\u001b\\u001c\\u001d\\u001e\\u001fab"}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 320000000261002600000061625c220102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f61620000 -320000000261002600000061625c220102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f61620000 -{"a":"ab\\\"\u0001\u0002\u0003\u0004\u0005\u0006\u0007\b\t\n\u000b\f\r\u000e\u000f\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001fab"} {"a":"ab\\\"\u0001\u0002\u0003\u0004\u0005\u0006\u0007\b\t\n\u000b\f\r\u000e\u000f\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001fab"} 320000000261002600000061625c220102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f61620000 -320000000261002600000061625c220102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f61620000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/symbol-decodeError-001.phpt b/tests/bson-corpus/symbol-decodeError-001.phpt index 92cbcb492..d927038ba 100644 --- a/tests/bson-corpus/symbol-decodeError-001.phpt +++ b/tests/bson-corpus/symbol-decodeError-001.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('0C0000000E61000000000000'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/symbol-decodeError-002.phpt b/tests/bson-corpus/symbol-decodeError-002.phpt index dd46d578e..c8256a9d8 100644 --- a/tests/bson-corpus/symbol-decodeError-002.phpt +++ b/tests/bson-corpus/symbol-decodeError-002.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('0C0000000E6100FFFFFFFF00'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/symbol-decodeError-003.phpt b/tests/bson-corpus/symbol-decodeError-003.phpt index 75c723b52..c48f5e1b2 100644 --- a/tests/bson-corpus/symbol-decodeError-003.phpt +++ b/tests/bson-corpus/symbol-decodeError-003.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('100000000E6100050000006200620000'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/symbol-decodeError-004.phpt b/tests/bson-corpus/symbol-decodeError-004.phpt index c6cb0cd2e..64c174af0 100644 --- a/tests/bson-corpus/symbol-decodeError-004.phpt +++ b/tests/bson-corpus/symbol-decodeError-004.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('120000000E00FFFFFF00666F6F6261720000'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/symbol-decodeError-005.phpt b/tests/bson-corpus/symbol-decodeError-005.phpt index 1df0ab732..ef1642d7d 100644 --- a/tests/bson-corpus/symbol-decodeError-005.phpt +++ b/tests/bson-corpus/symbol-decodeError-005.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('100000000E610004000000616263FF00'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/symbol-decodeError-006.phpt b/tests/bson-corpus/symbol-decodeError-006.phpt index 0ae6e62ae..d84e5b27c 100644 --- a/tests/bson-corpus/symbol-decodeError-006.phpt +++ b/tests/bson-corpus/symbol-decodeError-006.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('0E0000000E610001000000000000'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/symbol-decodeError-007.phpt b/tests/bson-corpus/symbol-decodeError-007.phpt index ceb14123c..7c76720f9 100644 --- a/tests/bson-corpus/symbol-decodeError-007.phpt +++ b/tests/bson-corpus/symbol-decodeError-007.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('0E0000000E610002000000E90000'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/symbol-valid-001.phpt b/tests/bson-corpus/symbol-valid-001.phpt index a6d0ab58d..2e74563d8 100644 --- a/tests/bson-corpus/symbol-valid-001.phpt +++ b/tests/bson-corpus/symbol-valid-001.phpt @@ -14,21 +14,12 @@ $convertedBson = hex2bin('0D000000026100010000000000'); $canonicalExtJson = '{"a": {"$symbol": ""}}'; $convertedExtJson = '{"a": ""}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -37,9 +28,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 0d0000000e6100010000000000 -0d0000000e6100010000000000 -{"a":{"$symbol":""}} {"a":{"$symbol":""}} 0d0000000e6100010000000000 -0d0000000e6100010000000000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/symbol-valid-002.phpt b/tests/bson-corpus/symbol-valid-002.phpt index 52a07bd9c..624bbfc31 100644 --- a/tests/bson-corpus/symbol-valid-002.phpt +++ b/tests/bson-corpus/symbol-valid-002.phpt @@ -14,21 +14,12 @@ $convertedBson = hex2bin('0E00000002610002000000620000'); $canonicalExtJson = '{"a": {"$symbol": "b"}}'; $convertedExtJson = '{"a": "b"}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -37,9 +28,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 0e0000000e610002000000620000 -0e0000000e610002000000620000 -{"a":{"$symbol":"b"}} {"a":{"$symbol":"b"}} 0e0000000e610002000000620000 -0e0000000e610002000000620000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/symbol-valid-003.phpt b/tests/bson-corpus/symbol-valid-003.phpt index d70b484e6..1e4dff0db 100644 --- a/tests/bson-corpus/symbol-valid-003.phpt +++ b/tests/bson-corpus/symbol-valid-003.phpt @@ -14,21 +14,12 @@ $convertedBson = hex2bin('190000000261000D0000006162616261626162616261620000'); $canonicalExtJson = '{"a": {"$symbol": "abababababab"}}'; $convertedExtJson = '{"a": "abababababab"}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -37,9 +28,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 190000000e61000d0000006162616261626162616261620000 -190000000e61000d0000006162616261626162616261620000 -{"a":{"$symbol":"abababababab"}} {"a":{"$symbol":"abababababab"}} 190000000e61000d0000006162616261626162616261620000 -190000000e61000d0000006162616261626162616261620000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/symbol-valid-004.phpt b/tests/bson-corpus/symbol-valid-004.phpt index e359d483a..fe426fdda 100644 --- a/tests/bson-corpus/symbol-valid-004.phpt +++ b/tests/bson-corpus/symbol-valid-004.phpt @@ -14,21 +14,12 @@ $convertedBson = hex2bin('190000000261000D000000C3A9C3A9C3A9C3A9C3A9C3A90000'); $canonicalExtJson = '{"a": {"$symbol": "éééééé"}}'; $convertedExtJson = '{"a": "éééééé"}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -37,9 +28,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 190000000e61000d000000c3a9c3a9c3a9c3a9c3a9c3a90000 -190000000e61000d000000c3a9c3a9c3a9c3a9c3a9c3a90000 -{"a":{"$symbol":"\u00e9\u00e9\u00e9\u00e9\u00e9\u00e9"}} {"a":{"$symbol":"\u00e9\u00e9\u00e9\u00e9\u00e9\u00e9"}} 190000000e61000d000000c3a9c3a9c3a9c3a9c3a9c3a90000 -190000000e61000d000000c3a9c3a9c3a9c3a9c3a9c3a90000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/symbol-valid-005.phpt b/tests/bson-corpus/symbol-valid-005.phpt index 8b1c312c5..4066650e1 100644 --- a/tests/bson-corpus/symbol-valid-005.phpt +++ b/tests/bson-corpus/symbol-valid-005.phpt @@ -14,21 +14,12 @@ $convertedBson = hex2bin('190000000261000D000000E29886E29886E29886E298860000'); $canonicalExtJson = '{"a": {"$symbol": "☆☆☆☆"}}'; $convertedExtJson = '{"a": "☆☆☆☆"}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -37,9 +28,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 190000000e61000d000000e29886e29886e29886e298860000 -190000000e61000d000000e29886e29886e29886e298860000 -{"a":{"$symbol":"\u2606\u2606\u2606\u2606"}} {"a":{"$symbol":"\u2606\u2606\u2606\u2606"}} 190000000e61000d000000e29886e29886e29886e298860000 -190000000e61000d000000e29886e29886e29886e298860000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/symbol-valid-006.phpt b/tests/bson-corpus/symbol-valid-006.phpt index 195e90b7f..fdc03c8fa 100644 --- a/tests/bson-corpus/symbol-valid-006.phpt +++ b/tests/bson-corpus/symbol-valid-006.phpt @@ -14,21 +14,12 @@ $convertedBson = hex2bin('190000000261000D0000006162006261620062616261620000'); $canonicalExtJson = '{"a": {"$symbol": "ab\\u0000bab\\u0000babab"}}'; $convertedExtJson = '{"a": "ab\\u0000bab\\u0000babab"}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -37,9 +28,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 190000000e61000d0000006162006261620062616261620000 -190000000e61000d0000006162006261620062616261620000 -{"a":{"$symbol":"ab\u0000bab\u0000babab"}} {"a":{"$symbol":"ab\u0000bab\u0000babab"}} 190000000e61000d0000006162006261620062616261620000 -190000000e61000d0000006162006261620062616261620000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/timestamp-decodeError-001.phpt b/tests/bson-corpus/timestamp-decodeError-001.phpt index 361d0009a..141da372e 100644 --- a/tests/bson-corpus/timestamp-decodeError-001.phpt +++ b/tests/bson-corpus/timestamp-decodeError-001.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('0f0000001161002A00000015CD5B00'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/timestamp-valid-001.phpt b/tests/bson-corpus/timestamp-valid-001.phpt index cf0999810..fa2223620 100644 --- a/tests/bson-corpus/timestamp-valid-001.phpt +++ b/tests/bson-corpus/timestamp-valid-001.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('100000001161002A00000015CD5B0700'); $canonicalExtJson = '{"a" : {"$timestamp" : {"t" : 123456789, "i" : 42} } }'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 100000001161002a00000015cd5b0700 -100000001161002a00000015cd5b0700 -{"a":{"$timestamp":{"t":123456789,"i":42}}} {"a":{"$timestamp":{"t":123456789,"i":42}}} 100000001161002a00000015cd5b0700 -100000001161002a00000015cd5b0700 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/timestamp-valid-002.phpt b/tests/bson-corpus/timestamp-valid-002.phpt index 3ddb33107..4df3545e4 100644 --- a/tests/bson-corpus/timestamp-valid-002.phpt +++ b/tests/bson-corpus/timestamp-valid-002.phpt @@ -13,27 +13,15 @@ $canonicalBson = hex2bin('100000001161002A00000015CD5B0700'); $canonicalExtJson = '{"a" : {"$timestamp" : {"t" : 123456789, "i" : 42} } }'; $degenerateExtJson = '{"a" : {"$timestamp" : {"i" : 42, "t" : 123456789} } }'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; -// Degenerate extJSON -> Canonical BSON -echo bin2hex(fromJSON($degenerateExtJson)), "\n"; - // Degenerate extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n"; @@ -42,11 +30,7 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($degenerateExtJson)), "\n" --EXPECT-- 100000001161002a00000015cd5b0700 -100000001161002a00000015cd5b0700 -{"a":{"$timestamp":{"t":123456789,"i":42}}} {"a":{"$timestamp":{"t":123456789,"i":42}}} 100000001161002a00000015cd5b0700 100000001161002a00000015cd5b0700 -100000001161002a00000015cd5b0700 -100000001161002a00000015cd5b0700 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/timestamp-valid-003.phpt b/tests/bson-corpus/timestamp-valid-003.phpt index afb436a2f..e8662b1d5 100644 --- a/tests/bson-corpus/timestamp-valid-003.phpt +++ b/tests/bson-corpus/timestamp-valid-003.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('10000000116100FFFFFFFFFFFFFFFF00'); $canonicalExtJson = '{"a" : {"$timestamp" : {"t" : 4294967295, "i" : 4294967295} } }'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 10000000116100ffffffffffffffff00 -10000000116100ffffffffffffffff00 -{"a":{"$timestamp":{"t":4294967295,"i":4294967295}}} {"a":{"$timestamp":{"t":4294967295,"i":4294967295}}} 10000000116100ffffffffffffffff00 -10000000116100ffffffffffffffff00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/timestamp-valid-004.phpt b/tests/bson-corpus/timestamp-valid-004.phpt index f835e90d6..963e06cda 100644 --- a/tests/bson-corpus/timestamp-valid-004.phpt +++ b/tests/bson-corpus/timestamp-valid-004.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1000000011610000286BEE00286BEE00'); $canonicalExtJson = '{"a" : {"$timestamp" : {"t" : 4000000000, "i" : 4000000000} } }'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1000000011610000286bee00286bee00 -1000000011610000286bee00286bee00 -{"a":{"$timestamp":{"t":4000000000,"i":4000000000}}} {"a":{"$timestamp":{"t":4000000000,"i":4000000000}}} 1000000011610000286bee00286bee00 -1000000011610000286bee00286bee00 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/top-decodeError-001.phpt b/tests/bson-corpus/top-decodeError-001.phpt index 93e68eac8..5ea38bc88 100644 --- a/tests/bson-corpus/top-decodeError-001.phpt +++ b/tests/bson-corpus/top-decodeError-001.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('0100000000'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/top-decodeError-002.phpt b/tests/bson-corpus/top-decodeError-002.phpt index a29c1602d..785cefc77 100644 --- a/tests/bson-corpus/top-decodeError-002.phpt +++ b/tests/bson-corpus/top-decodeError-002.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('0400000000'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/top-decodeError-003.phpt b/tests/bson-corpus/top-decodeError-003.phpt index d2564b5a4..1bd44d280 100644 --- a/tests/bson-corpus/top-decodeError-003.phpt +++ b/tests/bson-corpus/top-decodeError-003.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('05000000'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/top-decodeError-004.phpt b/tests/bson-corpus/top-decodeError-004.phpt index 55e0c0f31..00aa20e3d 100644 --- a/tests/bson-corpus/top-decodeError-004.phpt +++ b/tests/bson-corpus/top-decodeError-004.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('0500000001'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/top-decodeError-005.phpt b/tests/bson-corpus/top-decodeError-005.phpt index 6de87311b..a89559da3 100644 --- a/tests/bson-corpus/top-decodeError-005.phpt +++ b/tests/bson-corpus/top-decodeError-005.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('05000000FF'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/top-decodeError-006.phpt b/tests/bson-corpus/top-decodeError-006.phpt index 61014281f..96a51c4bb 100644 --- a/tests/bson-corpus/top-decodeError-006.phpt +++ b/tests/bson-corpus/top-decodeError-006.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('0500000070'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/top-decodeError-007.phpt b/tests/bson-corpus/top-decodeError-007.phpt index 092bc50dc..6b73331db 100644 --- a/tests/bson-corpus/top-decodeError-007.phpt +++ b/tests/bson-corpus/top-decodeError-007.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('00000000000000000000'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/top-decodeError-008.phpt b/tests/bson-corpus/top-decodeError-008.phpt index ddabe4005..262edcd99 100644 --- a/tests/bson-corpus/top-decodeError-008.phpt +++ b/tests/bson-corpus/top-decodeError-008.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('1200000002666F6F0004000000626172'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/top-decodeError-009.phpt b/tests/bson-corpus/top-decodeError-009.phpt index 22b3963af..318302f79 100644 --- a/tests/bson-corpus/top-decodeError-009.phpt +++ b/tests/bson-corpus/top-decodeError-009.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('1200000002666F6F00040000006261720000DEADBEEF'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/top-decodeError-010.phpt b/tests/bson-corpus/top-decodeError-010.phpt index 3196d43d9..3d16a53b7 100644 --- a/tests/bson-corpus/top-decodeError-010.phpt +++ b/tests/bson-corpus/top-decodeError-010.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('1300000002666F6F00040000006261720000'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/top-decodeError-011.phpt b/tests/bson-corpus/top-decodeError-011.phpt index 9013cece7..7d52398e3 100644 --- a/tests/bson-corpus/top-decodeError-011.phpt +++ b/tests/bson-corpus/top-decodeError-011.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('1100000002666F6F00040000006261720000'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/top-decodeError-012.phpt b/tests/bson-corpus/top-decodeError-012.phpt index 48d54e36b..623743758 100644 --- a/tests/bson-corpus/top-decodeError-012.phpt +++ b/tests/bson-corpus/top-decodeError-012.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('07000000000000'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/top-decodeError-013.phpt b/tests/bson-corpus/top-decodeError-013.phpt index 058441051..23392a7db 100644 --- a/tests/bson-corpus/top-decodeError-013.phpt +++ b/tests/bson-corpus/top-decodeError-013.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('07000000800000'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/top-decodeError-014.phpt b/tests/bson-corpus/top-decodeError-014.phpt index 1aafdfce0..b7e389fcc 100644 --- a/tests/bson-corpus/top-decodeError-014.phpt +++ b/tests/bson-corpus/top-decodeError-014.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('1200000002666F'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/top-decodeError-015.phpt b/tests/bson-corpus/top-decodeError-015.phpt index 0743f936b..9aeae23a8 100644 --- a/tests/bson-corpus/top-decodeError-015.phpt +++ b/tests/bson-corpus/top-decodeError-015.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . '/../utils/basic.inc'; $bson = hex2bin('0D000000107800000100000000'); throws(function() use ($bson) { - var_dump(toPHP($bson)); + MongoDB\BSON\Document::fromBSON($bson)->toPHP(); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/top-parseError-001.phpt b/tests/bson-corpus/top-parseError-001.phpt index 8d6f6b12d..f1fc78020 100644 --- a/tests/bson-corpus/top-parseError-001.phpt +++ b/tests/bson-corpus/top-parseError-001.phpt @@ -10,7 +10,7 @@ DO NOT EDIT THIS FILE require_once __DIR__ . '/../utils/basic.inc'; throws(function() { - fromJSON('{"a" : {"$regularExpression": {"pattern": "abc", "options": "", "unrelated": true}}}'); + MongoDB\BSON\Document::fromJSON('{"a" : {"$regularExpression": {"pattern": "abc", "options": "", "unrelated": true}}}'); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/top-parseError-002.phpt b/tests/bson-corpus/top-parseError-002.phpt index 34936d3f4..d2ae38666 100644 --- a/tests/bson-corpus/top-parseError-002.phpt +++ b/tests/bson-corpus/top-parseError-002.phpt @@ -10,7 +10,7 @@ DO NOT EDIT THIS FILE require_once __DIR__ . '/../utils/basic.inc'; throws(function() { - fromJSON('{"a" : {"$regularExpression": {"pattern": "abc"}}}'); + MongoDB\BSON\Document::fromJSON('{"a" : {"$regularExpression": {"pattern": "abc"}}}'); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/top-parseError-003.phpt b/tests/bson-corpus/top-parseError-003.phpt index a5dcbfe96..d643ad99a 100644 --- a/tests/bson-corpus/top-parseError-003.phpt +++ b/tests/bson-corpus/top-parseError-003.phpt @@ -10,7 +10,7 @@ DO NOT EDIT THIS FILE require_once __DIR__ . '/../utils/basic.inc'; throws(function() { - fromJSON('{"x" : {"$regularExpression" : { "pattern": 42, "options" : ""}}}'); + MongoDB\BSON\Document::fromJSON('{"x" : {"$regularExpression" : { "pattern": 42, "options" : ""}}}'); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/top-parseError-004.phpt b/tests/bson-corpus/top-parseError-004.phpt index acbe3f042..5ace6c0be 100644 --- a/tests/bson-corpus/top-parseError-004.phpt +++ b/tests/bson-corpus/top-parseError-004.phpt @@ -10,7 +10,7 @@ DO NOT EDIT THIS FILE require_once __DIR__ . '/../utils/basic.inc'; throws(function() { - fromJSON('{"x" : {"$regularExpression" : { "pattern": "a", "options" : 0}}}'); + MongoDB\BSON\Document::fromJSON('{"x" : {"$regularExpression" : { "pattern": "a", "options" : 0}}}'); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/top-parseError-005.phpt b/tests/bson-corpus/top-parseError-005.phpt index 3dbe0a1c2..94b91cfb3 100644 --- a/tests/bson-corpus/top-parseError-005.phpt +++ b/tests/bson-corpus/top-parseError-005.phpt @@ -10,7 +10,7 @@ DO NOT EDIT THIS FILE require_once __DIR__ . '/../utils/basic.inc'; throws(function() { - fromJSON('{"a" : {"$regularExpression": {"options":"ix"}}}'); + MongoDB\BSON\Document::fromJSON('{"a" : {"$regularExpression": {"options":"ix"}}}'); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/top-parseError-006.phpt b/tests/bson-corpus/top-parseError-006.phpt index ccd851487..7bca865ff 100644 --- a/tests/bson-corpus/top-parseError-006.phpt +++ b/tests/bson-corpus/top-parseError-006.phpt @@ -10,7 +10,7 @@ DO NOT EDIT THIS FILE require_once __DIR__ . '/../utils/basic.inc'; throws(function() { - fromJSON('{"a" : {"$oid" : 42}}'); + MongoDB\BSON\Document::fromJSON('{"a" : {"$oid" : 42}}'); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/top-parseError-007.phpt b/tests/bson-corpus/top-parseError-007.phpt index 06c4d4025..ab82de25e 100644 --- a/tests/bson-corpus/top-parseError-007.phpt +++ b/tests/bson-corpus/top-parseError-007.phpt @@ -10,7 +10,7 @@ DO NOT EDIT THIS FILE require_once __DIR__ . '/../utils/basic.inc'; throws(function() { - fromJSON('{"a" : {"$oid" : "56e1fc72e0c917e9c4714161", "unrelated": true}}'); + MongoDB\BSON\Document::fromJSON('{"a" : {"$oid" : "56e1fc72e0c917e9c4714161", "unrelated": true}}'); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/top-parseError-008.phpt b/tests/bson-corpus/top-parseError-008.phpt index 0ff780e64..db5e4938c 100644 --- a/tests/bson-corpus/top-parseError-008.phpt +++ b/tests/bson-corpus/top-parseError-008.phpt @@ -10,7 +10,7 @@ DO NOT EDIT THIS FILE require_once __DIR__ . '/../utils/basic.inc'; throws(function() { - fromJSON('{"a" : {"$numberInt" : 42}}'); + MongoDB\BSON\Document::fromJSON('{"a" : {"$numberInt" : 42}}'); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/top-parseError-009.phpt b/tests/bson-corpus/top-parseError-009.phpt index 5d1519645..653a34eda 100644 --- a/tests/bson-corpus/top-parseError-009.phpt +++ b/tests/bson-corpus/top-parseError-009.phpt @@ -10,7 +10,7 @@ DO NOT EDIT THIS FILE require_once __DIR__ . '/../utils/basic.inc'; throws(function() { - fromJSON('{"a" : {"$numberInt" : "42", "unrelated": true}}'); + MongoDB\BSON\Document::fromJSON('{"a" : {"$numberInt" : "42", "unrelated": true}}'); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/top-parseError-010.phpt b/tests/bson-corpus/top-parseError-010.phpt index 85f008714..c115c8f90 100644 --- a/tests/bson-corpus/top-parseError-010.phpt +++ b/tests/bson-corpus/top-parseError-010.phpt @@ -10,7 +10,7 @@ DO NOT EDIT THIS FILE require_once __DIR__ . '/../utils/basic.inc'; throws(function() { - fromJSON('{"a" : {"$numberLong" : 42}}'); + MongoDB\BSON\Document::fromJSON('{"a" : {"$numberLong" : 42}}'); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/top-parseError-011.phpt b/tests/bson-corpus/top-parseError-011.phpt index d50306401..2668125cb 100644 --- a/tests/bson-corpus/top-parseError-011.phpt +++ b/tests/bson-corpus/top-parseError-011.phpt @@ -10,7 +10,7 @@ DO NOT EDIT THIS FILE require_once __DIR__ . '/../utils/basic.inc'; throws(function() { - fromJSON('{"a" : {"$numberLong" : "42", "unrelated": true}}'); + MongoDB\BSON\Document::fromJSON('{"a" : {"$numberLong" : "42", "unrelated": true}}'); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/top-parseError-012.phpt b/tests/bson-corpus/top-parseError-012.phpt index 02bb76480..5ff6f0854 100644 --- a/tests/bson-corpus/top-parseError-012.phpt +++ b/tests/bson-corpus/top-parseError-012.phpt @@ -10,7 +10,7 @@ DO NOT EDIT THIS FILE require_once __DIR__ . '/../utils/basic.inc'; throws(function() { - fromJSON('{"a" : {"$numberDouble" : 42}}'); + MongoDB\BSON\Document::fromJSON('{"a" : {"$numberDouble" : 42}}'); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/top-parseError-013.phpt b/tests/bson-corpus/top-parseError-013.phpt index a167e5294..ba6d08307 100644 --- a/tests/bson-corpus/top-parseError-013.phpt +++ b/tests/bson-corpus/top-parseError-013.phpt @@ -10,7 +10,7 @@ DO NOT EDIT THIS FILE require_once __DIR__ . '/../utils/basic.inc'; throws(function() { - fromJSON('{"a" : {"$numberDouble" : ".1", "unrelated": true}}'); + MongoDB\BSON\Document::fromJSON('{"a" : {"$numberDouble" : ".1", "unrelated": true}}'); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/top-parseError-014.phpt b/tests/bson-corpus/top-parseError-014.phpt index 089ee1ca9..ed1b4063b 100644 --- a/tests/bson-corpus/top-parseError-014.phpt +++ b/tests/bson-corpus/top-parseError-014.phpt @@ -10,7 +10,7 @@ DO NOT EDIT THIS FILE require_once __DIR__ . '/../utils/basic.inc'; throws(function() { - fromJSON('{"a" : {"$numberDecimal" : 42}}'); + MongoDB\BSON\Document::fromJSON('{"a" : {"$numberDecimal" : 42}}'); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/top-parseError-015.phpt b/tests/bson-corpus/top-parseError-015.phpt index d32f9f17d..b8dc5edeb 100644 --- a/tests/bson-corpus/top-parseError-015.phpt +++ b/tests/bson-corpus/top-parseError-015.phpt @@ -10,7 +10,7 @@ DO NOT EDIT THIS FILE require_once __DIR__ . '/../utils/basic.inc'; throws(function() { - fromJSON('{"a" : {"$numberDecimal" : ".1", "unrelated": true}}'); + MongoDB\BSON\Document::fromJSON('{"a" : {"$numberDecimal" : ".1", "unrelated": true}}'); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/top-parseError-016.phpt b/tests/bson-corpus/top-parseError-016.phpt index 28bc5c252..1a46b4bc0 100644 --- a/tests/bson-corpus/top-parseError-016.phpt +++ b/tests/bson-corpus/top-parseError-016.phpt @@ -10,7 +10,7 @@ DO NOT EDIT THIS FILE require_once __DIR__ . '/../utils/basic.inc'; throws(function() { - fromJSON('{"x" : {"$binary" : {"base64" : 0, "subType" : "00"}}}'); + MongoDB\BSON\Document::fromJSON('{"x" : {"$binary" : {"base64" : 0, "subType" : "00"}}}'); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/top-parseError-017.phpt b/tests/bson-corpus/top-parseError-017.phpt index eb4888dd0..fb731d63e 100644 --- a/tests/bson-corpus/top-parseError-017.phpt +++ b/tests/bson-corpus/top-parseError-017.phpt @@ -10,7 +10,7 @@ DO NOT EDIT THIS FILE require_once __DIR__ . '/../utils/basic.inc'; throws(function() { - fromJSON('{"x" : {"$binary" : {"base64" : "", "subType" : 0}}}'); + MongoDB\BSON\Document::fromJSON('{"x" : {"$binary" : {"base64" : "", "subType" : 0}}}'); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/top-parseError-018.phpt b/tests/bson-corpus/top-parseError-018.phpt index 820369b63..256549153 100644 --- a/tests/bson-corpus/top-parseError-018.phpt +++ b/tests/bson-corpus/top-parseError-018.phpt @@ -10,7 +10,7 @@ DO NOT EDIT THIS FILE require_once __DIR__ . '/../utils/basic.inc'; throws(function() { - fromJSON('{"x" : {"$binary" : {"base64" : "//8="}}}'); + MongoDB\BSON\Document::fromJSON('{"x" : {"$binary" : {"base64" : "//8="}}}'); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/top-parseError-019.phpt b/tests/bson-corpus/top-parseError-019.phpt index f94229b7d..ec03bf454 100644 --- a/tests/bson-corpus/top-parseError-019.phpt +++ b/tests/bson-corpus/top-parseError-019.phpt @@ -10,7 +10,7 @@ DO NOT EDIT THIS FILE require_once __DIR__ . '/../utils/basic.inc'; throws(function() { - fromJSON('{"x" : {"$binary" : {"subType" : "00"}}}'); + MongoDB\BSON\Document::fromJSON('{"x" : {"$binary" : {"subType" : "00"}}}'); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/top-parseError-020.phpt b/tests/bson-corpus/top-parseError-020.phpt index 3a8c08808..367e7446c 100644 --- a/tests/bson-corpus/top-parseError-020.phpt +++ b/tests/bson-corpus/top-parseError-020.phpt @@ -10,7 +10,7 @@ DO NOT EDIT THIS FILE require_once __DIR__ . '/../utils/basic.inc'; throws(function() { - fromJSON('{"x" : {"$binary" : {"base64" : "//8=", "subType" : 0, "unrelated": true}}}'); + MongoDB\BSON\Document::fromJSON('{"x" : {"$binary" : {"base64" : "//8=", "subType" : 0, "unrelated": true}}}'); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/top-parseError-021.phpt b/tests/bson-corpus/top-parseError-021.phpt index cd888b89a..d9bcbf238 100644 --- a/tests/bson-corpus/top-parseError-021.phpt +++ b/tests/bson-corpus/top-parseError-021.phpt @@ -10,7 +10,7 @@ DO NOT EDIT THIS FILE require_once __DIR__ . '/../utils/basic.inc'; throws(function() { - fromJSON('{"a" : {"$code" : 42}}'); + MongoDB\BSON\Document::fromJSON('{"a" : {"$code" : 42}}'); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/top-parseError-022.phpt b/tests/bson-corpus/top-parseError-022.phpt index 5f431f068..9070ca41c 100644 --- a/tests/bson-corpus/top-parseError-022.phpt +++ b/tests/bson-corpus/top-parseError-022.phpt @@ -10,7 +10,7 @@ DO NOT EDIT THIS FILE require_once __DIR__ . '/../utils/basic.inc'; throws(function() { - fromJSON('{"a" : {"$code" : 42, "$scope" : {}}}'); + MongoDB\BSON\Document::fromJSON('{"a" : {"$code" : 42, "$scope" : {}}}'); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/top-parseError-023.phpt b/tests/bson-corpus/top-parseError-023.phpt index 54ce654d0..0a66820e7 100644 --- a/tests/bson-corpus/top-parseError-023.phpt +++ b/tests/bson-corpus/top-parseError-023.phpt @@ -10,7 +10,7 @@ DO NOT EDIT THIS FILE require_once __DIR__ . '/../utils/basic.inc'; throws(function() { - fromJSON('{"a" : {"$code" : "", "unrelated": true}}'); + MongoDB\BSON\Document::fromJSON('{"a" : {"$code" : "", "unrelated": true}}'); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/top-parseError-024.phpt b/tests/bson-corpus/top-parseError-024.phpt index b28a4ef46..66e7d3153 100644 --- a/tests/bson-corpus/top-parseError-024.phpt +++ b/tests/bson-corpus/top-parseError-024.phpt @@ -10,7 +10,7 @@ DO NOT EDIT THIS FILE require_once __DIR__ . '/../utils/basic.inc'; throws(function() { - fromJSON('{"x" : {"$code" : "", "$scope" : 42}}'); + MongoDB\BSON\Document::fromJSON('{"x" : {"$code" : "", "$scope" : 42}}'); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/top-parseError-025.phpt b/tests/bson-corpus/top-parseError-025.phpt index 3938ec341..e5b1da180 100644 --- a/tests/bson-corpus/top-parseError-025.phpt +++ b/tests/bson-corpus/top-parseError-025.phpt @@ -10,7 +10,7 @@ DO NOT EDIT THIS FILE require_once __DIR__ . '/../utils/basic.inc'; throws(function() { - fromJSON('{"a" : {"$timestamp" : 42} }'); + MongoDB\BSON\Document::fromJSON('{"a" : {"$timestamp" : 42} }'); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/top-parseError-026.phpt b/tests/bson-corpus/top-parseError-026.phpt index 094854bb3..dacb084bf 100644 --- a/tests/bson-corpus/top-parseError-026.phpt +++ b/tests/bson-corpus/top-parseError-026.phpt @@ -10,7 +10,7 @@ DO NOT EDIT THIS FILE require_once __DIR__ . '/../utils/basic.inc'; throws(function() { - fromJSON('{"a" : {"$timestamp" : {"t" : "123456789", "i" : 42} } }'); + MongoDB\BSON\Document::fromJSON('{"a" : {"$timestamp" : {"t" : "123456789", "i" : 42} } }'); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/top-parseError-027.phpt b/tests/bson-corpus/top-parseError-027.phpt index ed63cdeb5..0583a73c1 100644 --- a/tests/bson-corpus/top-parseError-027.phpt +++ b/tests/bson-corpus/top-parseError-027.phpt @@ -10,7 +10,7 @@ DO NOT EDIT THIS FILE require_once __DIR__ . '/../utils/basic.inc'; throws(function() { - fromJSON('{"a" : {"$timestamp" : {"t" : 123456789, "i" : "42"} } }'); + MongoDB\BSON\Document::fromJSON('{"a" : {"$timestamp" : {"t" : 123456789, "i" : "42"} } }'); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/top-parseError-028.phpt b/tests/bson-corpus/top-parseError-028.phpt index 2ffaa4ae2..c406ae852 100644 --- a/tests/bson-corpus/top-parseError-028.phpt +++ b/tests/bson-corpus/top-parseError-028.phpt @@ -10,7 +10,7 @@ DO NOT EDIT THIS FILE require_once __DIR__ . '/../utils/basic.inc'; throws(function() { - fromJSON('{"a" : {"$timestamp" : {"t" : "123456789", "i" : "42"}, "unrelated": true } }'); + MongoDB\BSON\Document::fromJSON('{"a" : {"$timestamp" : {"t" : "123456789", "i" : "42"}, "unrelated": true } }'); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/top-parseError-029.phpt b/tests/bson-corpus/top-parseError-029.phpt index c42c704ad..5c7651682 100644 --- a/tests/bson-corpus/top-parseError-029.phpt +++ b/tests/bson-corpus/top-parseError-029.phpt @@ -10,7 +10,7 @@ DO NOT EDIT THIS FILE require_once __DIR__ . '/../utils/basic.inc'; throws(function() { - fromJSON('{"a" : {"$timestamp" : {"t" : "123456789", "i" : "42", "unrelated": true} } }'); + MongoDB\BSON\Document::fromJSON('{"a" : {"$timestamp" : {"t" : "123456789", "i" : "42", "unrelated": true} } }'); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/top-parseError-030.phpt b/tests/bson-corpus/top-parseError-030.phpt index 30135dbd4..f7198d606 100644 --- a/tests/bson-corpus/top-parseError-030.phpt +++ b/tests/bson-corpus/top-parseError-030.phpt @@ -10,7 +10,7 @@ DO NOT EDIT THIS FILE require_once __DIR__ . '/../utils/basic.inc'; throws(function() { - fromJSON('{"a" : {"$timestamp" : {"i" : "42"} } }'); + MongoDB\BSON\Document::fromJSON('{"a" : {"$timestamp" : {"i" : "42"} } }'); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/top-parseError-031.phpt b/tests/bson-corpus/top-parseError-031.phpt index e1aed11ca..0c393f523 100644 --- a/tests/bson-corpus/top-parseError-031.phpt +++ b/tests/bson-corpus/top-parseError-031.phpt @@ -10,7 +10,7 @@ DO NOT EDIT THIS FILE require_once __DIR__ . '/../utils/basic.inc'; throws(function() { - fromJSON('{"a" : {"$timestamp" : {"t" : "123456789"} } }'); + MongoDB\BSON\Document::fromJSON('{"a" : {"$timestamp" : {"t" : "123456789"} } }'); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/top-parseError-032.phpt b/tests/bson-corpus/top-parseError-032.phpt index 3da6c35fa..ba5b2fd9d 100644 --- a/tests/bson-corpus/top-parseError-032.phpt +++ b/tests/bson-corpus/top-parseError-032.phpt @@ -12,7 +12,7 @@ DO NOT EDIT THIS FILE require_once __DIR__ . '/../utils/basic.inc'; throws(function() { - fromJSON('{"a" : {"$date" : 42}}'); + MongoDB\BSON\Document::fromJSON('{"a" : {"$date" : 42}}'); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/top-parseError-033.phpt b/tests/bson-corpus/top-parseError-033.phpt index 2da529e9d..5e113321e 100644 --- a/tests/bson-corpus/top-parseError-033.phpt +++ b/tests/bson-corpus/top-parseError-033.phpt @@ -10,7 +10,7 @@ DO NOT EDIT THIS FILE require_once __DIR__ . '/../utils/basic.inc'; throws(function() { - fromJSON('{"a" : {"$date" : {"$numberLong" : "1356351330501"}, "unrelated": true}}'); + MongoDB\BSON\Document::fromJSON('{"a" : {"$date" : {"$numberLong" : "1356351330501"}, "unrelated": true}}'); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/top-parseError-034.phpt b/tests/bson-corpus/top-parseError-034.phpt index 3736f8116..2360b13df 100644 --- a/tests/bson-corpus/top-parseError-034.phpt +++ b/tests/bson-corpus/top-parseError-034.phpt @@ -10,7 +10,7 @@ DO NOT EDIT THIS FILE require_once __DIR__ . '/../utils/basic.inc'; throws(function() { - fromJSON('{"a" : {"$minKey" : true}}'); + MongoDB\BSON\Document::fromJSON('{"a" : {"$minKey" : true}}'); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/top-parseError-035.phpt b/tests/bson-corpus/top-parseError-035.phpt index 1eec43cb0..058d8867d 100644 --- a/tests/bson-corpus/top-parseError-035.phpt +++ b/tests/bson-corpus/top-parseError-035.phpt @@ -10,7 +10,7 @@ DO NOT EDIT THIS FILE require_once __DIR__ . '/../utils/basic.inc'; throws(function() { - fromJSON('{"a" : {"$minKey" : 0}}'); + MongoDB\BSON\Document::fromJSON('{"a" : {"$minKey" : 0}}'); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/top-parseError-036.phpt b/tests/bson-corpus/top-parseError-036.phpt index e0e2ef520..0ac7c02c4 100644 --- a/tests/bson-corpus/top-parseError-036.phpt +++ b/tests/bson-corpus/top-parseError-036.phpt @@ -10,7 +10,7 @@ DO NOT EDIT THIS FILE require_once __DIR__ . '/../utils/basic.inc'; throws(function() { - fromJSON('{"a" : {"$minKey" : 1, "unrelated": true}}'); + MongoDB\BSON\Document::fromJSON('{"a" : {"$minKey" : 1, "unrelated": true}}'); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/top-parseError-037.phpt b/tests/bson-corpus/top-parseError-037.phpt index aa5d2a513..57cfe57be 100644 --- a/tests/bson-corpus/top-parseError-037.phpt +++ b/tests/bson-corpus/top-parseError-037.phpt @@ -10,7 +10,7 @@ DO NOT EDIT THIS FILE require_once __DIR__ . '/../utils/basic.inc'; throws(function() { - fromJSON('{"a" : {"$maxKey" : true}}'); + MongoDB\BSON\Document::fromJSON('{"a" : {"$maxKey" : true}}'); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/top-parseError-038.phpt b/tests/bson-corpus/top-parseError-038.phpt index 3289cf6b8..09b284a36 100644 --- a/tests/bson-corpus/top-parseError-038.phpt +++ b/tests/bson-corpus/top-parseError-038.phpt @@ -10,7 +10,7 @@ DO NOT EDIT THIS FILE require_once __DIR__ . '/../utils/basic.inc'; throws(function() { - fromJSON('{"a" : {"$maxKey" : 0}}'); + MongoDB\BSON\Document::fromJSON('{"a" : {"$maxKey" : 0}}'); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/top-parseError-039.phpt b/tests/bson-corpus/top-parseError-039.phpt index 935006371..2928a72a9 100644 --- a/tests/bson-corpus/top-parseError-039.phpt +++ b/tests/bson-corpus/top-parseError-039.phpt @@ -10,7 +10,7 @@ DO NOT EDIT THIS FILE require_once __DIR__ . '/../utils/basic.inc'; throws(function() { - fromJSON('{"a" : {"$maxKey" : 1, "unrelated": true}}'); + MongoDB\BSON\Document::fromJSON('{"a" : {"$maxKey" : 1, "unrelated": true}}'); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/top-parseError-040.phpt b/tests/bson-corpus/top-parseError-040.phpt index d1bf639ca..9c05bc37e 100644 --- a/tests/bson-corpus/top-parseError-040.phpt +++ b/tests/bson-corpus/top-parseError-040.phpt @@ -10,7 +10,7 @@ DO NOT EDIT THIS FILE require_once __DIR__ . '/../utils/basic.inc'; throws(function() { - fromJSON('{"a": {"$dbPointer": {"a": {"$numberInt": "1"}, "$id": {"$oid": "56e1fc72e0c917e9c4714161"}, "c": {"$numberInt": "2"}, "$ref": "b"}}}'); + MongoDB\BSON\Document::fromJSON('{"a": {"$dbPointer": {"a": {"$numberInt": "1"}, "$id": {"$oid": "56e1fc72e0c917e9c4714161"}, "c": {"$numberInt": "2"}, "$ref": "b"}}}'); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/top-parseError-041.phpt b/tests/bson-corpus/top-parseError-041.phpt index 87e546442..4f0f71db3 100644 --- a/tests/bson-corpus/top-parseError-041.phpt +++ b/tests/bson-corpus/top-parseError-041.phpt @@ -10,7 +10,7 @@ DO NOT EDIT THIS FILE require_once __DIR__ . '/../utils/basic.inc'; throws(function() { - fromJSON('{"a\\u0000": 1 }'); + MongoDB\BSON\Document::fromJSON('{"a\\u0000": 1 }'); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/top-parseError-042.phpt b/tests/bson-corpus/top-parseError-042.phpt index d0de88571..c943bb195 100644 --- a/tests/bson-corpus/top-parseError-042.phpt +++ b/tests/bson-corpus/top-parseError-042.phpt @@ -10,7 +10,7 @@ DO NOT EDIT THIS FILE require_once __DIR__ . '/../utils/basic.inc'; throws(function() { - fromJSON('{"a" : {"b\\u0000": 1 }}'); + MongoDB\BSON\Document::fromJSON('{"a" : {"b\\u0000": 1 }}'); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/top-parseError-043.phpt b/tests/bson-corpus/top-parseError-043.phpt index 0268cf17a..bdcb8bad6 100644 --- a/tests/bson-corpus/top-parseError-043.phpt +++ b/tests/bson-corpus/top-parseError-043.phpt @@ -10,7 +10,7 @@ DO NOT EDIT THIS FILE require_once __DIR__ . '/../utils/basic.inc'; throws(function() { - fromJSON('{"a" : {"$regularExpression" : { "pattern": "b\\u0000", "options" : "i"}}}'); + MongoDB\BSON\Document::fromJSON('{"a" : {"$regularExpression" : { "pattern": "b\\u0000", "options" : "i"}}}'); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/top-parseError-044.phpt b/tests/bson-corpus/top-parseError-044.phpt index 870320a3e..95f181812 100644 --- a/tests/bson-corpus/top-parseError-044.phpt +++ b/tests/bson-corpus/top-parseError-044.phpt @@ -10,7 +10,7 @@ DO NOT EDIT THIS FILE require_once __DIR__ . '/../utils/basic.inc'; throws(function() { - fromJSON('{"a" : {"$regularExpression" : { "pattern": "b", "options" : "i\\u0000"}}}'); + MongoDB\BSON\Document::fromJSON('{"a" : {"$regularExpression" : { "pattern": "b", "options" : "i\\u0000"}}}'); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> diff --git a/tests/bson-corpus/top-valid-001.phpt b/tests/bson-corpus/top-valid-001.phpt index b797867a0..a9f9a8a45 100644 --- a/tests/bson-corpus/top-valid-001.phpt +++ b/tests/bson-corpus/top-valid-001.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('0F00000010246B6579002A00000000'); $canonicalExtJson = '{"$key": {"$numberInt": "42"}}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 0f00000010246b6579002a00000000 -0f00000010246b6579002a00000000 -{"$key":{"$numberInt":"42"}} {"$key":{"$numberInt":"42"}} 0f00000010246b6579002a00000000 -0f00000010246b6579002a00000000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/top-valid-002.phpt b/tests/bson-corpus/top-valid-002.phpt index 0a553930d..22e3fb23c 100644 --- a/tests/bson-corpus/top-valid-002.phpt +++ b/tests/bson-corpus/top-valid-002.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('0E00000002240002000000610000'); $canonicalExtJson = '{"$": "a"}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 0e00000002240002000000610000 -0e00000002240002000000610000 -{"$":"a"} {"$":"a"} 0e00000002240002000000610000 -0e00000002240002000000610000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/top-valid-003.phpt b/tests/bson-corpus/top-valid-003.phpt index 2e54b708f..403da84ba 100644 --- a/tests/bson-corpus/top-valid-003.phpt +++ b/tests/bson-corpus/top-valid-003.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('1000000002612E620002000000630000'); $canonicalExtJson = '{"a.b": "c"}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 1000000002612e620002000000630000 -1000000002612e620002000000630000 -{"a.b":"c"} {"a.b":"c"} 1000000002612e620002000000630000 -1000000002612e620002000000630000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/top-valid-004.phpt b/tests/bson-corpus/top-valid-004.phpt index 275c524e2..a1245c512 100644 --- a/tests/bson-corpus/top-valid-004.phpt +++ b/tests/bson-corpus/top-valid-004.phpt @@ -12,21 +12,12 @@ require_once __DIR__ . '/../utils/basic.inc'; $canonicalBson = hex2bin('0E000000022E0002000000610000'); $canonicalExtJson = '{".": "a"}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -35,9 +26,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 0e000000022e0002000000610000 -0e000000022e0002000000610000 -{".":"a"} {".":"a"} 0e000000022e0002000000610000 -0e000000022e0002000000610000 ===DONE=== \ No newline at end of file diff --git a/tests/bson-corpus/undefined-valid-001.phpt b/tests/bson-corpus/undefined-valid-001.phpt index d50c73f3d..c6074cb43 100644 --- a/tests/bson-corpus/undefined-valid-001.phpt +++ b/tests/bson-corpus/undefined-valid-001.phpt @@ -14,21 +14,12 @@ $convertedBson = hex2bin('080000000A610000'); $canonicalExtJson = '{"a" : {"$undefined" : true}}'; $convertedExtJson = '{"a" : null}'; -// Canonical BSON -> Native -> Canonical BSON -echo bin2hex(fromPHP(toPHP($canonicalBson))), "\n"; - // Canonical BSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromBSON($canonicalBson)), "\n"; -// Canonical BSON -> Canonical extJSON -echo json_canonicalize(toCanonicalExtendedJSON($canonicalBson)), "\n"; - // Canonical BSON -> BSON object -> Canonical extJSON echo json_canonicalize(MongoDB\BSON\Document::fromBSON($canonicalBson)->toCanonicalExtendedJSON()), "\n"; -// Canonical extJSON -> Canonical BSON -echo bin2hex(fromJSON($canonicalExtJson)), "\n"; - // Canonical extJSON -> BSON object -> Canonical BSON echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; @@ -37,9 +28,6 @@ echo bin2hex((string) MongoDB\BSON\Document::fromJSON($canonicalExtJson)), "\n"; --EXPECT-- 0800000006610000 -0800000006610000 -{"a":{"$undefined":true}} {"a":{"$undefined":true}} 0800000006610000 -0800000006610000 ===DONE=== \ No newline at end of file diff --git a/tests/bson/bson-binary-001.phpt b/tests/bson/bson-binary-001.phpt index 21bf78e2b..4bd7510a3 100644 --- a/tests/bson/bson-binary-001.phpt +++ b/tests/bson/bson-binary-001.phpt @@ -61,48 +61,48 @@ bool(true) bool(true) bool(true) bool(true) -Test#0 { "binary" : { "$binary" : "cmFuZG9tQmluYXJ5RGF0YQ==", "$type" : "00" } } -string(73) "{ "binary" : { "$binary" : "cmFuZG9tQmluYXJ5RGF0YQ==", "$type" : "00" } }" -string(73) "{ "binary" : { "$binary" : "cmFuZG9tQmluYXJ5RGF0YQ==", "$type" : "00" } }" +Test#0 { "binary" : { "$binary" : { "base64" : "cmFuZG9tQmluYXJ5RGF0YQ==", "subType" : "00" } } } +string(90) "{ "binary" : { "$binary" : { "base64" : "cmFuZG9tQmluYXJ5RGF0YQ==", "subType" : "00" } } }" +string(90) "{ "binary" : { "$binary" : { "base64" : "cmFuZG9tQmluYXJ5RGF0YQ==", "subType" : "00" } } }" bool(true) -Test#1 { "binary" : { "$binary" : "cmFuZG9tQmluYXJ5RGF0YQ==", "$type" : "01" } } -string(73) "{ "binary" : { "$binary" : "cmFuZG9tQmluYXJ5RGF0YQ==", "$type" : "01" } }" -string(73) "{ "binary" : { "$binary" : "cmFuZG9tQmluYXJ5RGF0YQ==", "$type" : "01" } }" +Test#1 { "binary" : { "$binary" : { "base64" : "cmFuZG9tQmluYXJ5RGF0YQ==", "subType" : "01" } } } +string(90) "{ "binary" : { "$binary" : { "base64" : "cmFuZG9tQmluYXJ5RGF0YQ==", "subType" : "01" } } }" +string(90) "{ "binary" : { "$binary" : { "base64" : "cmFuZG9tQmluYXJ5RGF0YQ==", "subType" : "01" } } }" bool(true) -Test#2 { "binary" : { "$binary" : "cmFuZG9tQmluYXJ5RGF0YQ==", "$type" : "02" } } -string(73) "{ "binary" : { "$binary" : "cmFuZG9tQmluYXJ5RGF0YQ==", "$type" : "02" } }" -string(73) "{ "binary" : { "$binary" : "cmFuZG9tQmluYXJ5RGF0YQ==", "$type" : "02" } }" +Test#2 { "binary" : { "$binary" : { "base64" : "cmFuZG9tQmluYXJ5RGF0YQ==", "subType" : "02" } } } +string(90) "{ "binary" : { "$binary" : { "base64" : "cmFuZG9tQmluYXJ5RGF0YQ==", "subType" : "02" } } }" +string(90) "{ "binary" : { "$binary" : { "base64" : "cmFuZG9tQmluYXJ5RGF0YQ==", "subType" : "02" } } }" bool(true) -Test#3 { "binary" : { "$binary" : "cmFuZG9tQmluYXJ5RGF0YQ==", "$type" : "03" } } -string(73) "{ "binary" : { "$binary" : "cmFuZG9tQmluYXJ5RGF0YQ==", "$type" : "03" } }" -string(73) "{ "binary" : { "$binary" : "cmFuZG9tQmluYXJ5RGF0YQ==", "$type" : "03" } }" +Test#3 { "binary" : { "$binary" : { "base64" : "cmFuZG9tQmluYXJ5RGF0YQ==", "subType" : "03" } } } +string(90) "{ "binary" : { "$binary" : { "base64" : "cmFuZG9tQmluYXJ5RGF0YQ==", "subType" : "03" } } }" +string(90) "{ "binary" : { "$binary" : { "base64" : "cmFuZG9tQmluYXJ5RGF0YQ==", "subType" : "03" } } }" bool(true) -Test#4 { "binary" : { "$binary" : "cmFuZG9tQmluYXJ5RGF0YQ==", "$type" : "04" } } -string(73) "{ "binary" : { "$binary" : "cmFuZG9tQmluYXJ5RGF0YQ==", "$type" : "04" } }" -string(73) "{ "binary" : { "$binary" : "cmFuZG9tQmluYXJ5RGF0YQ==", "$type" : "04" } }" +Test#4 { "binary" : { "$binary" : { "base64" : "cmFuZG9tQmluYXJ5RGF0YQ==", "subType" : "04" } } } +string(90) "{ "binary" : { "$binary" : { "base64" : "cmFuZG9tQmluYXJ5RGF0YQ==", "subType" : "04" } } }" +string(90) "{ "binary" : { "$binary" : { "base64" : "cmFuZG9tQmluYXJ5RGF0YQ==", "subType" : "04" } } }" bool(true) -Test#5 { "binary" : { "$binary" : "cmFuZG9tQmluYXJ5RGF0YQ==", "$type" : "05" } } -string(73) "{ "binary" : { "$binary" : "cmFuZG9tQmluYXJ5RGF0YQ==", "$type" : "05" } }" -string(73) "{ "binary" : { "$binary" : "cmFuZG9tQmluYXJ5RGF0YQ==", "$type" : "05" } }" +Test#5 { "binary" : { "$binary" : { "base64" : "cmFuZG9tQmluYXJ5RGF0YQ==", "subType" : "05" } } } +string(90) "{ "binary" : { "$binary" : { "base64" : "cmFuZG9tQmluYXJ5RGF0YQ==", "subType" : "05" } } }" +string(90) "{ "binary" : { "$binary" : { "base64" : "cmFuZG9tQmluYXJ5RGF0YQ==", "subType" : "05" } } }" bool(true) -Test#6 { "binary" : { "$binary" : "cmFuZG9tQmluYXJ5RGF0YQ==", "$type" : "06" } } -string(73) "{ "binary" : { "$binary" : "cmFuZG9tQmluYXJ5RGF0YQ==", "$type" : "06" } }" -string(73) "{ "binary" : { "$binary" : "cmFuZG9tQmluYXJ5RGF0YQ==", "$type" : "06" } }" +Test#6 { "binary" : { "$binary" : { "base64" : "cmFuZG9tQmluYXJ5RGF0YQ==", "subType" : "06" } } } +string(90) "{ "binary" : { "$binary" : { "base64" : "cmFuZG9tQmluYXJ5RGF0YQ==", "subType" : "06" } } }" +string(90) "{ "binary" : { "$binary" : { "base64" : "cmFuZG9tQmluYXJ5RGF0YQ==", "subType" : "06" } } }" bool(true) -Test#7 { "binary" : { "$binary" : "cmFuZG9tQmluYXJ5RGF0YQ==", "$type" : "07" } } -string(73) "{ "binary" : { "$binary" : "cmFuZG9tQmluYXJ5RGF0YQ==", "$type" : "07" } }" -string(73) "{ "binary" : { "$binary" : "cmFuZG9tQmluYXJ5RGF0YQ==", "$type" : "07" } }" +Test#7 { "binary" : { "$binary" : { "base64" : "cmFuZG9tQmluYXJ5RGF0YQ==", "subType" : "07" } } } +string(90) "{ "binary" : { "$binary" : { "base64" : "cmFuZG9tQmluYXJ5RGF0YQ==", "subType" : "07" } } }" +string(90) "{ "binary" : { "$binary" : { "base64" : "cmFuZG9tQmluYXJ5RGF0YQ==", "subType" : "07" } } }" bool(true) -Test#8 { "binary" : { "$binary" : "cmFuZG9tQmluYXJ5RGF0YQ==", "$type" : "08" } } -string(73) "{ "binary" : { "$binary" : "cmFuZG9tQmluYXJ5RGF0YQ==", "$type" : "08" } }" -string(73) "{ "binary" : { "$binary" : "cmFuZG9tQmluYXJ5RGF0YQ==", "$type" : "08" } }" +Test#8 { "binary" : { "$binary" : { "base64" : "cmFuZG9tQmluYXJ5RGF0YQ==", "subType" : "08" } } } +string(90) "{ "binary" : { "$binary" : { "base64" : "cmFuZG9tQmluYXJ5RGF0YQ==", "subType" : "08" } } }" +string(90) "{ "binary" : { "$binary" : { "base64" : "cmFuZG9tQmluYXJ5RGF0YQ==", "subType" : "08" } } }" bool(true) -Test#9 { "binary" : { "$binary" : "cmFuZG9tQmluYXJ5RGF0YQ==", "$type" : "80" } } -string(73) "{ "binary" : { "$binary" : "cmFuZG9tQmluYXJ5RGF0YQ==", "$type" : "80" } }" -string(73) "{ "binary" : { "$binary" : "cmFuZG9tQmluYXJ5RGF0YQ==", "$type" : "80" } }" +Test#9 { "binary" : { "$binary" : { "base64" : "cmFuZG9tQmluYXJ5RGF0YQ==", "subType" : "80" } } } +string(90) "{ "binary" : { "$binary" : { "base64" : "cmFuZG9tQmluYXJ5RGF0YQ==", "subType" : "80" } } }" +string(90) "{ "binary" : { "$binary" : { "base64" : "cmFuZG9tQmluYXJ5RGF0YQ==", "subType" : "80" } } }" bool(true) -Test#10 { "binary" : { "$binary" : "cmFuZG9tQmluYXJ5RGF0YQ==", "$type" : "85" } } -string(73) "{ "binary" : { "$binary" : "cmFuZG9tQmluYXJ5RGF0YQ==", "$type" : "85" } }" -string(73) "{ "binary" : { "$binary" : "cmFuZG9tQmluYXJ5RGF0YQ==", "$type" : "85" } }" +Test#10 { "binary" : { "$binary" : { "base64" : "cmFuZG9tQmluYXJ5RGF0YQ==", "subType" : "85" } } } +string(90) "{ "binary" : { "$binary" : { "base64" : "cmFuZG9tQmluYXJ5RGF0YQ==", "subType" : "85" } } }" +string(90) "{ "binary" : { "$binary" : { "base64" : "cmFuZG9tQmluYXJ5RGF0YQ==", "subType" : "85" } } }" bool(true) ===DONE=== diff --git a/tests/bson/bson-binary-jsonserialize-002.phpt b/tests/bson/bson-binary-jsonserialize-002.phpt index af65152a9..87073feb8 100644 --- a/tests/bson/bson-binary-jsonserialize-002.phpt +++ b/tests/bson/bson-binary-jsonserialize-002.phpt @@ -16,7 +16,7 @@ var_dump(toPHP(fromJSON($json))); ===DONE=== --EXPECTF-- -{ "foo" : { "$binary" : "Z2FyZ2xlYmxhc3Rlcg==", "$type" : "18" } } +{ "foo" : { "$binary" : { "base64" : "Z2FyZ2xlYmxhc3Rlcg==", "subType" : "18" } } } {"foo":{"$binary":"Z2FyZ2xlYmxhc3Rlcg==","$type":"18"}} object(stdClass)#%d (%d) { ["foo"]=> diff --git a/tests/bson/bson-dbpointer-001.phpt b/tests/bson/bson-dbpointer-001.phpt index f4f125c34..d922e483b 100644 --- a/tests/bson/bson-dbpointer-001.phpt +++ b/tests/bson/bson-dbpointer-001.phpt @@ -6,7 +6,7 @@ MongoDB\BSON\DBPointer #001 require_once __DIR__ . '/../utils/basic.inc'; $tests = array( - MongoDB\BSON\toPHP(MongoDB\BSON\fromJSON('{ "dbref": {"$dbPointer": {"$ref": "phongo.test", "$id" : { "$oid" : "5a2e78accd485d55b405ac12" } }} }')), + MongoDB\BSON\Document::fromJSON('{ "dbref": {"$dbPointer": {"$ref": "phongo.test", "$id" : { "$oid" : "5a2e78accd485d55b405ac12" } }} }')->toPHP(), ); foreach($tests as $n => $test) { @@ -26,7 +26,7 @@ foreach($tests as $n => $test) { Test#0 bool(true) bool(true) -string(76) "{ "dbref" : { "$ref" : "phongo.test", "$id" : "5a2e78accd485d55b405ac12" } }" -string(76) "{ "dbref" : { "$ref" : "phongo.test", "$id" : "5a2e78accd485d55b405ac12" } }" +string(108) "{ "dbref" : { "$dbPointer" : { "$ref" : "phongo.test", "$id" : { "$oid" : "5a2e78accd485d55b405ac12" } } } }" +string(108) "{ "dbref" : { "$dbPointer" : { "$ref" : "phongo.test", "$id" : { "$oid" : "5a2e78accd485d55b405ac12" } } } }" bool(true) ===DONE=== diff --git a/tests/bson/bson-dbpointer-002.phpt b/tests/bson/bson-dbpointer-002.phpt index 58c37cb2c..35e85d3be 100644 --- a/tests/bson/bson-dbpointer-002.phpt +++ b/tests/bson/bson-dbpointer-002.phpt @@ -3,7 +3,7 @@ MongoDB\BSON\DBPointer debug handler --FILE-- toPHP(); var_dump($dbptr->dbref); ?> diff --git a/tests/bson/bson-dbpointer-clone-001.phpt b/tests/bson/bson-dbpointer-clone-001.phpt index 151b7a932..c7035ac91 100644 --- a/tests/bson/bson-dbpointer-clone-001.phpt +++ b/tests/bson/bson-dbpointer-clone-001.phpt @@ -8,7 +8,7 @@ MongoDB\BSON\DBPointer can be cloned (PHP < 8.2) require_once __DIR__ . '/../utils/basic.inc'; -$test = MongoDB\BSON\toPHP(MongoDB\BSON\fromJSON('{ "dbref": {"$dbPointer": {"$ref": "phongo.test", "$id" : { "$oid" : "5a2e78accd485d55b405ac12" } }} }')); +$test = MongoDB\BSON\Document::fromJSON('{ "dbref": {"$dbPointer": {"$ref": "phongo.test", "$id" : { "$oid" : "5a2e78accd485d55b405ac12" } }} }')->toPHP(); $dbPointer = $test->dbref; $clone = clone($dbPointer); diff --git a/tests/bson/bson-dbpointer-clone-002.phpt b/tests/bson/bson-dbpointer-clone-002.phpt index b55012cd9..d93c8759f 100644 --- a/tests/bson/bson-dbpointer-clone-002.phpt +++ b/tests/bson/bson-dbpointer-clone-002.phpt @@ -8,7 +8,7 @@ MongoDB\BSON\DBPointer can be cloned (PHP >= 8.2) require_once __DIR__ . '/../utils/basic.inc'; -$test = MongoDB\BSON\toPHP(MongoDB\BSON\fromJSON('{ "dbref": {"$dbPointer": {"$ref": "phongo.test", "$id" : { "$oid" : "5a2e78accd485d55b405ac12" } }} }')); +$test = MongoDB\BSON\Document::fromJSON('{ "dbref": {"$dbPointer": {"$ref": "phongo.test", "$id" : { "$oid" : "5a2e78accd485d55b405ac12" } }} }')->toPHP(); $dbPointer = $test->dbref; $clone = clone($dbPointer); diff --git a/tests/bson/bson-dbpointer-compare-001.phpt b/tests/bson/bson-dbpointer-compare-001.phpt index 5eb1425a9..4fc9f8dad 100644 --- a/tests/bson/bson-dbpointer-compare-001.phpt +++ b/tests/bson/bson-dbpointer-compare-001.phpt @@ -3,12 +3,12 @@ MongoDB\BSON\DBPointer comparisons --FILE-- toPHP(); +$jsonTest1a = MongoDB\BSON\Document::fromJSON('{ "dbref": {"$dbPointer": {"$ref": "phongo.test", "$id" : { "$oid" : "5a2e78accd485d55b4051111" } }} }')->toPHP(); +$jsonTest1b = MongoDB\BSON\Document::fromJSON('{ "dbref": {"$dbPointer": {"$ref": "phongo.test", "$id" : { "$oid" : "5a2e78accd485d55b4051111" } }} }')->toPHP(); +$jsonTest2 = MongoDB\BSON\Document::fromJSON('{ "dbref": {"$dbPointer": {"$ref": "phongo.test", "$id" : { "$oid" : "5a2e78accd485d55b4052222" } }} }')->toPHP(); +$jsonAAAA = MongoDB\BSON\Document::fromJSON('{ "dbref": {"$dbPointer": {"$ref": "phongo.aaaa", "$id" : { "$oid" : "5a2e78accd485d55b4051111" } }} }')->toPHP(); +$jsonZZZZ = MongoDB\BSON\Document::fromJSON('{ "dbref": {"$dbPointer": {"$ref": "phongo.zzzz", "$id" : { "$oid" : "5a2e78accd485d55b4051111" } }} }')->toPHP(); var_dump($jsonTest1a == $jsonTest1b); var_dump($jsonTest0 < $jsonTest1b); diff --git a/tests/bson/bson-dbpointer-get_properties-001.phpt b/tests/bson/bson-dbpointer-get_properties-001.phpt index c790222dc..0974c8714 100644 --- a/tests/bson/bson-dbpointer-get_properties-001.phpt +++ b/tests/bson/bson-dbpointer-get_properties-001.phpt @@ -3,7 +3,7 @@ MongoDB\BSON\DBPointer get_properties handler (get_object_vars) --FILE-- toPHP(); $dbptr = $document->dbptr; var_dump(get_object_vars($dbptr)); diff --git a/tests/bson/bson-dbpointer-get_properties-002.phpt b/tests/bson/bson-dbpointer-get_properties-002.phpt index fad60d957..249a042f7 100644 --- a/tests/bson/bson-dbpointer-get_properties-002.phpt +++ b/tests/bson/bson-dbpointer-get_properties-002.phpt @@ -3,7 +3,7 @@ MongoDB\BSON\DBPointer get_properties handler (foreach) --FILE-- toPHP(); $dbptr = $document->dbptr; foreach ($dbptr as $key => $value) { diff --git a/tests/bson/bson-dbpointer-jsonserialize-001.phpt b/tests/bson/bson-dbpointer-jsonserialize-001.phpt index c10679e53..3efd00ef0 100644 --- a/tests/bson/bson-dbpointer-jsonserialize-001.phpt +++ b/tests/bson/bson-dbpointer-jsonserialize-001.phpt @@ -3,7 +3,7 @@ MongoDB\BSON\DBPointer::jsonSerialize() return value --FILE-- dbref; +$dbref = MongoDB\BSON\Document::fromJSON('{ "dbref": {"$dbPointer": {"$ref": "phongo.test", "$id" : { "$oid" : "5a2e78accd485d55b4050000" } }} }')->toPHP()->dbref; var_dump($dbref->jsonSerialize()); ?> diff --git a/tests/bson/bson-dbpointer-jsonserialize-003.phpt b/tests/bson/bson-dbpointer-jsonserialize-003.phpt index da7869b27..31af41c95 100644 --- a/tests/bson/bson-dbpointer-jsonserialize-003.phpt +++ b/tests/bson/bson-dbpointer-jsonserialize-003.phpt @@ -5,7 +5,7 @@ MongoDB\BSON\DBPointer::jsonSerialize() with json_encode() require_once __DIR__ . '/../utils/basic.inc'; -$doc = MongoDB\BSON\toPHP(MongoDB\BSON\fromJSON('{ "foo": {"$dbPointer": {"$ref": "phongo.test", "$id" : { "$oid" : "5a2e78accd485d55b4050000" } }} }')); +$doc = MongoDB\BSON\Document::fromJSON('{ "foo": {"$dbPointer": {"$ref": "phongo.test", "$id" : { "$oid" : "5a2e78accd485d55b4050000" } }} }')->toPHP(); $json = json_encode($doc); echo toJSON(fromPHP($doc)), "\n"; @@ -16,7 +16,7 @@ var_dump(toPHP(fromJSON($json))); ===DONE=== --EXPECTF-- -{ "foo" : { "$ref" : "phongo.test", "$id" : "5a2e78accd485d55b4050000" } } +{ "foo" : { "$dbPointer" : { "$ref" : "phongo.test", "$id" : { "$oid" : "5a2e78accd485d55b4050000" } } } } {"foo":{"$dbPointer":{"$ref":"phongo.test","$id":{"$oid":"5a2e78accd485d55b4050000"}}}} object(stdClass)#%d (%d) { ["foo"]=> diff --git a/tests/bson/bson-dbpointer-serialization-002.phpt b/tests/bson/bson-dbpointer-serialization-002.phpt index 8668f2154..be5b1b78a 100644 --- a/tests/bson/bson-dbpointer-serialization-002.phpt +++ b/tests/bson/bson-dbpointer-serialization-002.phpt @@ -3,7 +3,7 @@ MongoDB\BSON\DBPointer serialization (__serialize and __unserialize) --FILE-- dbref; +$test = MongoDB\BSON\Document::fromJSON('{ "dbref": {"$dbPointer": {"$ref": "phongo.test", "$id" : { "$oid" : "5a2e78accd485d55b4050000" } }} }')->toPHP()->dbref; var_dump($test); var_dump($s = serialize($test)); diff --git a/tests/bson/bson-dbpointer-set_state-001.phpt b/tests/bson/bson-dbpointer-set_state-001.phpt index 6383db1cc..741f31b9f 100644 --- a/tests/bson/bson-dbpointer-set_state-001.phpt +++ b/tests/bson/bson-dbpointer-set_state-001.phpt @@ -3,7 +3,7 @@ MongoDB\BSON\DBPointer::__set_state() --FILE-- dbref; +$dbPointer = MongoDB\BSON\Document::fromJSON('{ "dbref": {"$dbPointer": {"$ref": "phongo.test", "$id" : { "$oid" : "5a2e78accd485d55b4050000" } }} }')->toPHP()->dbref; $s = var_export($dbPointer, true); echo $s, "\n"; diff --git a/tests/bson/bson-dbpointer-tostring-001.phpt b/tests/bson/bson-dbpointer-tostring-001.phpt index 019150a8d..5118d5ac2 100644 --- a/tests/bson/bson-dbpointer-tostring-001.phpt +++ b/tests/bson/bson-dbpointer-tostring-001.phpt @@ -3,7 +3,7 @@ MongoDB\BSON\DBPointer::__toString() --FILE-- dbref; +$dbref = MongoDB\BSON\Document::fromJSON('{ "dbref": {"$dbPointer": {"$ref": "phongo.test", "$id" : { "$oid" : "5a2e78accd485d55b4050000" } }} }')->toPHP()->dbref; var_dump((string) $dbref); ?> diff --git a/tests/bson/bson-decode-001.phpt b/tests/bson/bson-decode-001.phpt index 2d8022c88..47d5e593e 100644 --- a/tests/bson/bson-decode-001.phpt +++ b/tests/bson/bson-decode-001.phpt @@ -57,9 +57,9 @@ Test#1 { "0" : { "hello" : "world" } } OK Test#2 { "0" : null } OK -Test#3 { "0" : 123 } +Test#3 { "0" : { "$numberInt" : "123" } } OK -Test#4 { "0" : 4.125 } +Test#4 { "0" : { "$numberDouble" : "4.125" } } OK Test#5 { "0" : true } OK diff --git a/tests/bson/bson-encode-001.phpt b/tests/bson/bson-encode-001.phpt index f0a530725..84149bed9 100644 --- a/tests/bson/bson-encode-001.phpt +++ b/tests/bson/bson-encode-001.phpt @@ -52,19 +52,19 @@ Test#2 { "0" : { "hello" : "world" } } Test#3 { "0" : { "hello" : "world" } } 0 : 1e 00 00 00 03 30 00 16 00 00 00 02 68 65 6c 6c [.....0......hell] 10 : 6f 00 06 00 00 00 77 6f 72 6c 64 00 00 00 [o.....world...] -Test#4 { "0" : [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ] } +Test#4 { "0" : [ { "$numberInt" : "1" }, { "$numberInt" : "2" }, { "$numberInt" : "3" }, { "$numberInt" : "4" }, { "$numberInt" : "5" }, { "$numberInt" : "6" }, { "$numberInt" : "7" }, { "$numberInt" : "8" }, { "$numberInt" : "9" } ] } 0 : 4c 00 00 00 04 30 00 44 00 00 00 10 30 00 01 00 [L....0.D....0...] 10 : 00 00 10 31 00 02 00 00 00 10 32 00 03 00 00 00 [...1......2.....] 20 : 10 33 00 04 00 00 00 10 34 00 05 00 00 00 10 35 [.3......4......5] 30 : 00 06 00 00 00 10 36 00 07 00 00 00 10 37 00 08 [......6......7..] 40 : 00 00 00 10 38 00 09 00 00 00 00 00 [....8.......] -Test#5 { "0" : { "0" : 1, "1" : 2, "2" : 3, "3" : 4, "4" : 5, "5" : 6, "6" : 7, "7" : 8, "8" : 9 } } +Test#5 { "0" : { "0" : { "$numberInt" : "1" }, "1" : { "$numberInt" : "2" }, "2" : { "$numberInt" : "3" }, "3" : { "$numberInt" : "4" }, "4" : { "$numberInt" : "5" }, "5" : { "$numberInt" : "6" }, "6" : { "$numberInt" : "7" }, "7" : { "$numberInt" : "8" }, "8" : { "$numberInt" : "9" } } } 0 : 4c 00 00 00 03 30 00 44 00 00 00 10 30 00 01 00 [L....0.D....0...] 10 : 00 00 10 31 00 02 00 00 00 10 32 00 03 00 00 00 [...1......2.....] 20 : 10 33 00 04 00 00 00 10 34 00 05 00 00 00 10 35 [.3......4......5] 30 : 00 06 00 00 00 10 36 00 07 00 00 00 10 37 00 08 [......6......7..] 40 : 00 00 00 10 38 00 09 00 00 00 00 00 [....8.......] -Test#6 { "0" : [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ] } +Test#6 { "0" : [ { "$numberInt" : "1" }, { "$numberInt" : "2" }, { "$numberInt" : "3" }, { "$numberInt" : "4" }, { "$numberInt" : "5" }, { "$numberInt" : "6" }, { "$numberInt" : "7" }, { "$numberInt" : "8" }, { "$numberInt" : "9" } ] } 0 : 4c 00 00 00 04 30 00 44 00 00 00 10 30 00 01 00 [L....0.D....0...] 10 : 00 00 10 31 00 02 00 00 00 10 32 00 03 00 00 00 [...1......2.....] 20 : 10 33 00 04 00 00 00 10 34 00 05 00 00 00 10 35 [.3......4......5] @@ -72,9 +72,9 @@ Test#6 { "0" : [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ] } 40 : 00 00 00 10 38 00 09 00 00 00 00 00 [....8.......] Test#7 { "0" : null } 0 : 08 00 00 00 0a 30 00 00 [.....0..] -Test#8 { "0" : 123 } +Test#8 { "0" : { "$numberInt" : "123" } } 0 : 0c 00 00 00 10 30 00 7b 00 00 00 00 [.....0.{....] -Test#9 { "0" : 4.125 } +Test#9 { "0" : { "$numberDouble" : "4.125" } } 0 : 10 00 00 00 01 30 00 00 00 00 00 00 80 10 40 00 [.....0........@.] Test#10 { "0" : true } 0 : 09 00 00 00 08 30 00 01 00 [.....0...] @@ -98,7 +98,7 @@ Test#16 { "foo" : "test", "0" : "foo", "1" : "bar" } 0 : 29 00 00 00 02 66 6f 6f 00 05 00 00 00 74 65 73 [)....foo.....tes] 10 : 74 00 02 30 00 04 00 00 00 66 6f 6f 00 02 31 00 [t..0.....foo..1.] 20 : 04 00 00 00 62 61 72 00 00 [....bar..] -Test#17 { "int" : 3, "boolean" : true, "array" : [ "foo", "bar" ], "object" : { }, "string" : "test", "3" : "test" } +Test#17 { "int" : { "$numberInt" : "3" }, "boolean" : true, "array" : [ "foo", "bar" ], "object" : { }, "string" : "test", "3" : "test" } 0 : 64 00 00 00 10 69 6e 74 00 03 00 00 00 08 62 6f [d....int......bo] 10 : 6f 6c 65 61 6e 00 01 04 61 72 72 61 79 00 1b 00 [olean...array...] 20 : 00 00 02 30 00 04 00 00 00 66 6f 6f 00 02 31 00 [...0.....foo..1.] @@ -123,7 +123,7 @@ Test#21 { "0" : { "foo" : "test", "0" : "foo", "1" : "bar" } } 10 : 05 00 00 00 74 65 73 74 00 02 30 00 04 00 00 00 [....test..0.....] 20 : 66 6f 6f 00 02 31 00 04 00 00 00 62 61 72 00 00 [foo..1.....bar..] 30 : 00 [.] -Test#22 { "0" : { "int" : 3, "boolean" : true, "array" : [ "foo", "bar" ], "object" : { }, "string" : "test", "3" : "test" } } +Test#22 { "0" : { "int" : { "$numberInt" : "3" }, "boolean" : true, "array" : [ "foo", "bar" ], "object" : { }, "string" : "test", "3" : "test" } } 0 : 6c 00 00 00 03 30 00 64 00 00 00 10 69 6e 74 00 [l....0.d....int.] 10 : 03 00 00 00 08 62 6f 6f 6c 65 61 6e 00 01 04 61 [.....boolean...a] 20 : 72 72 61 79 00 1b 00 00 00 02 30 00 04 00 00 00 [rray......0.....] diff --git a/tests/bson/bson-encode-002.phpt b/tests/bson/bson-encode-002.phpt index 374e2f574..d017f3bd5 100644 --- a/tests/bson/bson-encode-002.phpt +++ b/tests/bson/bson-encode-002.phpt @@ -113,7 +113,7 @@ object(stdClass)#%d (1) { } Testing top-level NumericArray: -{ "0" : 1, "1" : 2, "2" : 3 } +{ "0" : { "$numberInt" : "1" }, "1" : { "$numberInt" : "2" }, "2" : { "$numberInt" : "3" } } Encoded BSON: 0 : 1a 00 00 00 10 30 00 01 00 00 00 10 31 00 02 00 [.....0......1...] 10 : 00 00 10 32 00 03 00 00 00 00 [...2......] @@ -131,7 +131,7 @@ object(NumericArray)#%d (0) { } Testing embedded NumericArray: -{ "embed" : [ 1, 2, 3 ] } +{ "embed" : [ { "$numberInt" : "1" }, { "$numberInt" : "2" }, { "$numberInt" : "3" } ] } Encoded BSON: 0 : 26 00 00 00 04 65 6d 62 65 64 00 1a 00 00 00 10 [&....embed......] 10 : 30 00 01 00 00 00 10 31 00 02 00 00 00 10 32 00 [0......1......2.] diff --git a/tests/bson/bson-encode-003.phpt b/tests/bson/bson-encode-003.phpt index 4fb55fa69..5421bfa77 100644 --- a/tests/bson/bson-encode-003.phpt +++ b/tests/bson/bson-encode-003.phpt @@ -50,7 +50,7 @@ foreach($tests as $n => $test) { ===DONE=== --EXPECTF-- -Test#0 { "stuff" : { "__pclass" : { "$binary" : "TXlDbGFzcw==", "$type" : "80" }, "random" : "class", "0" : "data" } } +Test#0 { "stuff" : { "__pclass" : { "$binary" : { "base64" : "TXlDbGFzcw==", "subType" : "80" } }, "random" : "class", "0" : "data" } } 0 : 45 00 00 00 03 73 74 75 66 66 00 39 00 00 00 05 [E....stuff.9....] 10 : 5f 5f 70 63 6c 61 73 73 00 07 00 00 00 80 4d 79 [__pclass......My] 20 : 43 6c 61 73 73 02 72 61 6e 64 6f 6d 00 06 00 00 [Class.random....] @@ -75,7 +75,7 @@ object(stdClass)#%d (1) { } } } -Test#1 { "stuff" : { "__pclass" : { "$binary" : "TXlDbGFzczI=", "$type" : "80" }, "0" : 1, "1" : 2, "2" : 3 } } +Test#1 { "stuff" : { "__pclass" : { "$binary" : { "base64" : "TXlDbGFzczI=", "subType" : "80" } }, "0" : { "$numberInt" : "1" }, "1" : { "$numberInt" : "2" }, "2" : { "$numberInt" : "3" } } } 0 : 3d 00 00 00 03 73 74 75 66 66 00 31 00 00 00 05 [=....stuff.1....] 10 : 5f 5f 70 63 6c 61 73 73 00 08 00 00 00 80 4d 79 [__pclass......My] 20 : 43 6c 61 73 73 32 10 30 00 01 00 00 00 10 31 00 [Class2.0......1.] @@ -101,7 +101,7 @@ object(stdClass)#%d (1) { } } } -Test#2 { "stuff" : [ { "__pclass" : { "$binary" : "TXlDbGFzcw==", "$type" : "80" }, "random" : "class", "0" : "data" }, { "__pclass" : { "$binary" : "TXlDbGFzczI=", "$type" : "80" }, "0" : 1, "1" : 2, "2" : 3 } ] } +Test#2 { "stuff" : [ { "__pclass" : { "$binary" : { "base64" : "TXlDbGFzcw==", "subType" : "80" } }, "random" : "class", "0" : "data" }, { "__pclass" : { "$binary" : { "base64" : "TXlDbGFzczI=", "subType" : "80" } }, "0" : { "$numberInt" : "1" }, "1" : { "$numberInt" : "2" }, "2" : { "$numberInt" : "3" } } ] } 0 : 81 00 00 00 04 73 74 75 66 66 00 75 00 00 00 03 [.....stuff.u....] 10 : 30 00 39 00 00 00 05 5f 5f 70 63 6c 61 73 73 00 [0.9....__pclass.] 20 : 07 00 00 00 80 4d 79 43 6c 61 73 73 02 72 61 6e [.....MyClass.ran] diff --git a/tests/bson/bson-encode-004.phpt b/tests/bson/bson-encode-004.phpt index 0608748ea..1d6f2751d 100644 --- a/tests/bson/bson-encode-004.phpt +++ b/tests/bson/bson-encode-004.phpt @@ -71,7 +71,7 @@ object(Person)#%d (5) { ["secret":protected]=> string(24) "Hannes confidential info" } -Test { "0" : { "__pclass" : { "$binary" : "UGVyc29u", "$type" : "80" }, "name" : "Hannes", "age" : 42, "addresses" : [ { "__pclass" : { "$binary" : "QWRkcmVzcw==", "$type" : "80" }, "zip" : 94086, "country" : "USA" }, { "__pclass" : { "$binary" : "QWRkcmVzcw==", "$type" : "80" }, "zip" : 200, "country" : "Iceland" } ], "friends" : [ { "__pclass" : { "$binary" : "UGVyc29u", "$type" : "80" }, "name" : "Jeremy", "age" : 21, "addresses" : [ ], "friends" : [ ] } ] } } +Test { "0" : { "__pclass" : { "$binary" : { "base64" : "UGVyc29u", "subType" : "80" } }, "name" : "Hannes", "age" : { "$numberInt" : "42" }, "addresses" : [ { "__pclass" : { "$binary" : { "base64" : "QWRkcmVzcw==", "subType" : "80" } }, "zip" : { "$numberInt" : "94086" }, "country" : "USA" }, { "__pclass" : { "$binary" : { "base64" : "QWRkcmVzcw==", "subType" : "80" } }, "zip" : { "$numberInt" : "200" }, "country" : "Iceland" } ], "friends" : [ { "__pclass" : { "$binary" : { "base64" : "UGVyc29u", "subType" : "80" } }, "name" : "Jeremy", "age" : { "$numberInt" : "21" }, "addresses" : [ ], "friends" : [ ] } ] } } 0 : 23 01 00 00 03 30 00 1b 01 00 00 05 5f 5f 70 63 [#....0......__pc] 10 : 6c 61 73 73 00 06 00 00 00 80 50 65 72 73 6f 6e [lass......Person] 20 : 02 6e 61 6d 65 00 07 00 00 00 48 61 6e 6e 65 73 [.name.....Hannes] diff --git a/tests/bson/bson-fromJSON-001.phpt b/tests/bson/bson-fromJSON-001.phpt index bdd0b118c..b9c151146 100644 --- a/tests/bson/bson-fromJSON-001.phpt +++ b/tests/bson/bson-fromJSON-001.phpt @@ -14,24 +14,32 @@ $tests = [ foreach ($tests as $json) { printf("Test %s\n", $json); - $bson = fromJSON($json); + $bson = MongoDB\BSON\fromJSON($json); hex_dump($bson); } ?> ===DONE=== ---EXPECT-- +--EXPECTF-- Test {} + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s 0 : 05 00 00 00 00 [.....] Test { "foo": "bar" } + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s 0 : 12 00 00 00 02 66 6f 6f 00 04 00 00 00 62 61 72 [.....foo.....bar] 10 : 00 00 [..] Test { "foo": [ 1, 2, 3 ]} + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s 0 : 24 00 00 00 04 66 6f 6f 00 1a 00 00 00 10 30 00 [$....foo......0.] 10 : 01 00 00 00 10 31 00 02 00 00 00 10 32 00 03 00 [.....1......2...] 20 : 00 00 00 00 [....] Test { "foo": { "bar": 1 }} + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s 0 : 18 00 00 00 03 66 6f 6f 00 0e 00 00 00 10 62 61 [.....foo......ba] 10 : 72 00 01 00 00 00 00 00 [r.......] ===DONE=== diff --git a/tests/bson/bson-fromJSON-002.phpt b/tests/bson/bson-fromJSON-002.phpt index 566d0087b..e8681a270 100644 --- a/tests/bson/bson-fromJSON-002.phpt +++ b/tests/bson/bson-fromJSON-002.phpt @@ -19,36 +19,54 @@ $tests = [ foreach ($tests as $json) { printf("Test %s\n", $json); - $bson = fromJSON($json); + $bson = MongoDB\BSON\fromJSON($json); hex_dump($bson); } ?> ===DONE=== ---EXPECT-- +--EXPECTF-- Test { "_id": { "$oid": "56315a7c6118fd1b920270b1" }} + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s 0 : 16 00 00 00 07 5f 69 64 00 56 31 5a 7c 61 18 fd [....._id.V1Z|a..] 10 : 1b 92 02 70 b1 00 [...p..] Test { "binary": { "$binary": "Zm9v", "$type": "00" }} + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s 0 : 15 00 00 00 05 62 69 6e 61 72 79 00 03 00 00 00 [.....binary.....] 10 : 00 66 6f 6f 00 [.foo.] Test { "date": { "$date": "2015-10-28T00:00:00Z" }} + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s 0 : 13 00 00 00 09 64 61 74 65 00 00 80 be ab 50 01 [.....date.....P.] 10 : 00 00 00 [...] Test { "timestamp": { "$timestamp": { "t": 1446084619, "i": 0 }}} + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s 0 : 18 00 00 00 11 74 69 6d 65 73 74 61 6d 70 00 00 [.....timestamp..] 10 : 00 00 00 0b 80 31 56 00 [.....1V.] Test { "regex": { "$regex": "pattern", "$options": "i" }} + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s 0 : 16 00 00 00 0b 72 65 67 65 78 00 70 61 74 74 65 [.....regex.patte] 10 : 72 6e 00 69 00 00 [rn.i..] Test { "undef": { "$undefined": true }} + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s 0 : 0c 00 00 00 06 75 6e 64 65 66 00 00 [.....undef..] Test { "minkey": { "$minKey": 1 }} + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s 0 : 0d 00 00 00 ff 6d 69 6e 6b 65 79 00 00 [.....minkey..] Test { "maxkey": { "$maxKey": 1 }} + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s 0 : 0d 00 00 00 7f 6d 61 78 6b 65 79 00 00 [.....maxkey..] Test { "long": { "$numberLong": "1234" }} + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s 0 : 13 00 00 00 12 6c 6f 6e 67 00 d2 04 00 00 00 00 [.....long.......] 10 : 00 00 00 [...] ===DONE=== diff --git a/tests/bson/bson-fromJSON-003.phpt b/tests/bson/bson-fromJSON-003.phpt index bb20a7190..25e56e7f8 100644 --- a/tests/bson/bson-fromJSON-003.phpt +++ b/tests/bson/bson-fromJSON-003.phpt @@ -7,12 +7,13 @@ require_once __DIR__ . '/../utils/basic.inc'; /* Note: this is a regression test for libmongoc's JSON encoder. It is not * advisable to use duplicate keys in BSON documents. */ -hex_dump(fromJSON('{ "foo": "bar", "foo": "baz" }')); +hex_dump(MongoDB\BSON\fromJSON('{ "foo": "bar", "foo": "baz" }')); ?> ===DONE=== ---EXPECT-- +--EXPECTF-- +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s 0 : 1f 00 00 00 02 66 6f 6f 00 04 00 00 00 62 61 72 [.....foo.....bar] 10 : 00 02 66 6f 6f 00 04 00 00 00 62 61 7a 00 00 [..foo.....baz..] ===DONE=== diff --git a/tests/bson/bson-fromJSON_error-001.phpt b/tests/bson/bson-fromJSON_error-001.phpt index a7884b5a7..0b989c44b 100644 --- a/tests/bson/bson-fromJSON_error-001.phpt +++ b/tests/bson/bson-fromJSON_error-001.phpt @@ -6,12 +6,13 @@ MongoDB\BSON\fromJSON(): invalid JSON require_once __DIR__ . '/../utils/basic.inc'; throws(function() { - fromJSON('foo'); + MongoDB\BSON\fromJSON('foo'); }, 'MongoDB\Driver\Exception\UnexpectedValueException'); ?> ===DONE=== ---EXPECT-- +--EXPECTF-- +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException ===DONE=== diff --git a/tests/bson/bson-fromPHP-001.phpt b/tests/bson/bson-fromPHP-001.phpt index 92680183a..af2105d5f 100644 --- a/tests/bson/bson-fromPHP-001.phpt +++ b/tests/bson/bson-fromPHP-001.phpt @@ -44,12 +44,12 @@ echo "Testing top-level objects\n"; foreach ($tests as $test) { try { - echo toJson(fromPHP(new MyDocument($test))), "\n"; + echo MongoDB\BSON\toJson(MongoDB\BSON\fromPHP(new MyDocument($test))), "\n"; } catch (Exception $e) { printf("%s: %s\n", get_class($e), $e->getMessage()); } try { - echo toJson(fromPHP(new MyPersistableDocument($test))), "\n"; + echo MongoDB\BSON\toJson(MongoDB\BSON\fromPHP(new MyPersistableDocument($test))), "\n"; } catch (Exception $e) { printf("%s: %s\n", get_class($e), $e->getMessage()); } @@ -59,12 +59,12 @@ echo "\nTesting nested objects\n"; foreach ($tests as $test) { try { - echo toJson(fromPHP(new MyDocument(['nested' => new MyDocument($test)]))), "\n"; + echo MongoDB\BSON\toJson(MongoDB\BSON\fromPHP(new MyDocument(['nested' => new MyDocument($test)]))), "\n"; } catch (Exception $e) { printf("%s: %s\n", get_class($e), $e->getMessage()); } try { - echo toJson(fromPHP(new MyDocument(['nested' => new MyPersistableDocument($test)]))), "\n"; + echo MongoDB\BSON\toJson(MongoDB\BSON\fromPHP(new MyDocument(['nested' => new MyPersistableDocument($test)]))), "\n"; } catch (Exception $e) { printf("%s: %s\n", get_class($e), $e->getMessage()); } @@ -73,32 +73,122 @@ foreach ($tests as $test) { ?> ===DONE=== ---EXPECT-- +--EXPECTF-- Testing top-level objects + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s { "0" : 1, "1" : 2, "2" : 3 } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s { "__pclass" : { "$binary" : "TXlQZXJzaXN0YWJsZURvY3VtZW50", "$type" : "80" }, "0" : 1, "1" : 2, "2" : 3 } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s { "foo" : "bar" } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s { "__pclass" : { "$binary" : "TXlQZXJzaXN0YWJsZURvY3VtZW50", "$type" : "80" }, "foo" : "bar" } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s { "0" : 1, "1" : 2, "2" : 3 } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s { "__pclass" : { "$binary" : "TXlQZXJzaXN0YWJsZURvY3VtZW50", "$type" : "80" }, "0" : 1, "1" : 2, "2" : 3 } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s { "foo" : "bar" } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s { "__pclass" : { "$binary" : "TXlQZXJzaXN0YWJsZURvY3VtZW50", "$type" : "80" }, "foo" : "bar" } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s MongoDB\Driver\Exception\UnexpectedValueException: MongoDB\BSON\PackedArray cannot be serialized as a root document + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s MongoDB\Driver\Exception\UnexpectedValueException: Expected MyPersistableDocument::bsonSerialize() to return an array, stdClass, or MongoDB\BSON\Document, MongoDB\BSON\PackedArray given + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s { "foo" : "bar" } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s { "__pclass" : { "$binary" : "TXlQZXJzaXN0YWJsZURvY3VtZW50", "$type" : "80" }, "foo" : "bar" } Testing nested objects + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s { "nested" : [ 1, 2, 3 ] } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s { "nested" : { "__pclass" : { "$binary" : "TXlQZXJzaXN0YWJsZURvY3VtZW50", "$type" : "80" }, "0" : 1, "1" : 2, "2" : 3 } } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s { "nested" : { "foo" : "bar" } } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s { "nested" : { "__pclass" : { "$binary" : "TXlQZXJzaXN0YWJsZURvY3VtZW50", "$type" : "80" }, "foo" : "bar" } } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s { "nested" : { "0" : 1, "1" : 2, "2" : 3 } } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s { "nested" : { "__pclass" : { "$binary" : "TXlQZXJzaXN0YWJsZURvY3VtZW50", "$type" : "80" }, "0" : 1, "1" : 2, "2" : 3 } } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s { "nested" : { "foo" : "bar" } } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s { "nested" : { "__pclass" : { "$binary" : "TXlQZXJzaXN0YWJsZURvY3VtZW50", "$type" : "80" }, "foo" : "bar" } } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s { "nested" : [ 1, 2, 3 ] } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s MongoDB\Driver\Exception\UnexpectedValueException: Expected MyPersistableDocument::bsonSerialize() to return an array, stdClass, or MongoDB\BSON\Document, MongoDB\BSON\PackedArray given + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s { "nested" : { "foo" : "bar" } } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s { "nested" : { "__pclass" : { "$binary" : "TXlQZXJzaXN0YWJsZURvY3VtZW50", "$type" : "80" }, "foo" : "bar" } } ===DONE=== diff --git a/tests/bson/bson-fromPHP-002.phpt b/tests/bson/bson-fromPHP-002.phpt index 4c55066c4..2526f7764 100644 --- a/tests/bson/bson-fromPHP-002.phpt +++ b/tests/bson/bson-fromPHP-002.phpt @@ -11,14 +11,17 @@ class MyDocument { public $baz = 3; } -$s = fromPHP(new MyDocument); -echo "Test ", toJSON($s), "\n"; +$s = MongoDB\BSON\fromPHP(new MyDocument); +echo "Test " . MongoDB\BSON\toJSON($s) . "\n"; hex_dump($s); ?> ===DONE=== ---EXPECT-- +--EXPECTF-- +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s Test { "baz" : 3 } 0 : 0e 00 00 00 10 62 61 7a 00 03 00 00 00 00 [.....baz......] ===DONE=== diff --git a/tests/bson/bson-fromPHP-003.phpt b/tests/bson/bson-fromPHP-003.phpt index 181b6794a..38df0c17e 100644 --- a/tests/bson/bson-fromPHP-003.phpt +++ b/tests/bson/bson-fromPHP-003.phpt @@ -19,22 +19,37 @@ $tests = array( ); foreach ($tests as $document) { - $s = fromPHP($document); - echo "Test ", toJSON($s), "\n"; + $s = MongoDB\BSON\fromPHP($document); + echo "Test " . MongoDB\BSON\toJSON($s) . "\n"; hex_dump($s); } ?> ===DONE=== ---EXPECT-- +--EXPECTF-- +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s Test { "0" : { "$date" : 1416445411987 } } 0 : 10 00 00 00 09 30 00 93 c2 b9 ca 49 01 00 00 00 [.....0.....I....] + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s Test { "x" : { "$date" : 1416445411987 } } 0 : 10 00 00 00 09 78 00 93 c2 b9 ca 49 01 00 00 00 [.....x.....I....] + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s Test { "0" : { "baz" : 3 } } 0 : 16 00 00 00 03 30 00 0e 00 00 00 10 62 61 7a 00 [.....0......baz.] 10 : 03 00 00 00 00 00 [......] + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s Test { "x" : { "baz" : 3 } } 0 : 16 00 00 00 03 78 00 0e 00 00 00 10 62 61 7a 00 [.....x......baz.] 10 : 03 00 00 00 00 00 [......] diff --git a/tests/bson/bson-fromPHP-005.phpt b/tests/bson/bson-fromPHP-005.phpt index 3e7673ea8..e9d8ad2cd 100644 --- a/tests/bson/bson-fromPHP-005.phpt +++ b/tests/bson/bson-fromPHP-005.phpt @@ -1,5 +1,5 @@ --TEST-- -BSON\fromPHP(): PHP document with public property whose name is an empty string +MongoDB\BSON\fromPHP(): PHP document with public property whose name is an empty string --FILE-- ===DONE=== ---EXPECT-- +--EXPECTF-- +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s Test { "" : 1 } 0 : 0b 00 00 00 10 00 01 00 00 00 00 [...........] + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s Test { "" : 1 } 0 : 0b 00 00 00 10 00 01 00 00 00 00 [...........] ===DONE=== diff --git a/tests/bson/bson-fromPHP-006.phpt b/tests/bson/bson-fromPHP-006.phpt index 17c83992a..68d81dda0 100644 --- a/tests/bson/bson-fromPHP-006.phpt +++ b/tests/bson/bson-fromPHP-006.phpt @@ -1,5 +1,5 @@ --TEST-- -BSON\fromPHP(): PHP documents with null bytes in field name +MongoDB\BSON\fromPHP(): PHP documents with null bytes in field name --FILE-- 1])); +hex_dump(MongoDB\BSON\fromPHP((object) ["\0" => 1])); echo "\nTesting object with multiple null bytes in field name\n"; -hex_dump(fromPHP((object) ["\0\0\0" => 1])); +hex_dump(MongoDB\BSON\fromPHP((object) ["\0\0\0" => 1])); ?> ===DONE=== ---EXPECT-- +--EXPECTF-- Testing object with one leading null byte in field name + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s 0 : 05 00 00 00 00 [.....] Testing object with multiple null bytes in field name + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s 0 : 05 00 00 00 00 [.....] ===DONE=== diff --git a/tests/bson/bson-fromPHP_error-001.phpt b/tests/bson/bson-fromPHP_error-001.phpt index 5f9352573..c4d720954 100644 --- a/tests/bson/bson-fromPHP_error-001.phpt +++ b/tests/bson/bson-fromPHP_error-001.phpt @@ -27,7 +27,7 @@ echo "Testing top-level objects\n"; foreach ($invalidValues as $invalidValue) { try { - hex_dump(fromPHP(new MyDocument($invalidValue))); + hex_dump(MongoDB\BSON\fromPHP(new MyDocument($invalidValue))); } catch (MongoDB\Driver\Exception\UnexpectedValueException $e) { echo $e->getMessage(), "\n"; } @@ -37,7 +37,7 @@ echo "\nTesting nested objects\n"; foreach ($invalidValues as $invalidValue) { try { - hex_dump(fromPHP(new MyDocument(array('nested' => new MyDocument($invalidValue))))); + hex_dump(MongoDB\BSON\fromPHP(new MyDocument(array('nested' => new MyDocument($invalidValue))))); } catch (MongoDB\Driver\Exception\UnexpectedValueException $e) { echo $e->getMessage(), "\n"; } @@ -46,18 +46,38 @@ foreach ($invalidValues as $invalidValue) { ?> ===DONE=== ---EXPECT-- +--EXPECTF-- Testing top-level objects + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s Expected MyDocument::bsonSerialize() to return an array, stdClass, MongoDB\BSON\Document, or MongoDB\BSON\PackedArray, null given + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s Expected MyDocument::bsonSerialize() to return an array, stdClass, MongoDB\BSON\Document, or MongoDB\BSON\PackedArray, int given + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s Expected MyDocument::bsonSerialize() to return an array, stdClass, MongoDB\BSON\Document, or MongoDB\BSON\PackedArray, string given + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s Expected MyDocument::bsonSerialize() to return an array, stdClass, MongoDB\BSON\Document, or MongoDB\BSON\PackedArray, bool given + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s Expected MyDocument::bsonSerialize() to return an array, stdClass, MongoDB\BSON\Document, or MongoDB\BSON\PackedArray, MyDocument given Testing nested objects + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s Expected MyDocument::bsonSerialize() to return an array, stdClass, MongoDB\BSON\Document, or MongoDB\BSON\PackedArray, null given + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s Expected MyDocument::bsonSerialize() to return an array, stdClass, MongoDB\BSON\Document, or MongoDB\BSON\PackedArray, int given + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s Expected MyDocument::bsonSerialize() to return an array, stdClass, MongoDB\BSON\Document, or MongoDB\BSON\PackedArray, string given + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s Expected MyDocument::bsonSerialize() to return an array, stdClass, MongoDB\BSON\Document, or MongoDB\BSON\PackedArray, bool given + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s Expected MyDocument::bsonSerialize() to return an array, stdClass, MongoDB\BSON\Document, or MongoDB\BSON\PackedArray, MyDocument given ===DONE=== diff --git a/tests/bson/bson-fromPHP_error-002.phpt b/tests/bson/bson-fromPHP_error-002.phpt index 63768e602..b5671070d 100644 --- a/tests/bson/bson-fromPHP_error-002.phpt +++ b/tests/bson/bson-fromPHP_error-002.phpt @@ -14,16 +14,19 @@ $tests = array( foreach ($tests as $document) { echo throws(function() use ($document) { - fromPHP($document); + MongoDB\BSON\fromPHP($document); }, 'MongoDB\Driver\Exception\UnexpectedValueException'), "\n"; } ?> ===DONE=== ---EXPECT-- +--EXPECTF-- +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException Unexpected MongoDB\BSON\Type instance: UnknownType + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException Unexpected MongoDB\BSON\Type instance: UnknownType ===DONE=== diff --git a/tests/bson/bson-fromPHP_error-003.phpt b/tests/bson/bson-fromPHP_error-003.phpt index 57501c8d0..b6f355ec8 100644 --- a/tests/bson/bson-fromPHP_error-003.phpt +++ b/tests/bson/bson-fromPHP_error-003.phpt @@ -21,29 +21,46 @@ $tests = array( foreach ($tests as $document) { echo throws(function() use ($document) { - fromPHP($document); + MongoDB\BSON\fromPHP($document); }, 'MongoDB\Driver\Exception\UnexpectedValueException'), "\n";} ?> ===DONE=== ---EXPECT-- +--EXPECTF-- +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException MongoDB\BSON\Type instance UnknownType cannot be serialized as a root element + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException MongoDB\BSON\Type instance MongoDB\BSON\Binary cannot be serialized as a root element + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException MongoDB\BSON\Type instance MongoDB\BSON\Javascript cannot be serialized as a root element + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException MongoDB\BSON\Type instance MongoDB\BSON\MinKey cannot be serialized as a root element + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException MongoDB\BSON\Type instance MongoDB\BSON\MaxKey cannot be serialized as a root element + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException MongoDB\BSON\Type instance MongoDB\BSON\ObjectId cannot be serialized as a root element + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException MongoDB\BSON\Type instance MongoDB\BSON\Regex cannot be serialized as a root element + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException MongoDB\BSON\Type instance MongoDB\BSON\Timestamp cannot be serialized as a root element + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException MongoDB\BSON\Type instance MongoDB\BSON\UTCDateTime cannot be serialized as a root element ===DONE=== diff --git a/tests/bson/bson-fromPHP_error-004.phpt b/tests/bson/bson-fromPHP_error-004.phpt index f641d36c8..86270e4af 100644 --- a/tests/bson/bson-fromPHP_error-004.phpt +++ b/tests/bson/bson-fromPHP_error-004.phpt @@ -10,7 +10,7 @@ echo "\nTesting packed array with circular reference\n"; echo throws(function() { $document = ['x' => 1, 'y' => []]; $document['y'][] = &$document['y']; - fromPHP($document); + MongoDB\BSON\fromPHP($document); }, 'MongoDB\Driver\Exception\UnexpectedValueException'), "\n"; echo "\nTesting packed array with circular reference at 3rd position\n"; @@ -18,7 +18,7 @@ echo "\nTesting packed array with circular reference at 3rd position\n"; echo throws(function() { $document = ['x' => 1, 'y' => [1, 2, 3]]; $document['y'][] = &$document['y']; - fromPHP($document); + MongoDB\BSON\fromPHP($document); }, 'MongoDB\Driver\Exception\UnexpectedValueException'), "\n"; echo "\nTesting associative array with circular reference\n"; @@ -26,7 +26,7 @@ echo "\nTesting associative array with circular reference\n"; echo throws(function() { $document = ['x' => 1, 'y' => []]; $document['y']['z'] = &$document['y']; - fromPHP($document); + MongoDB\BSON\fromPHP($document); }, 'MongoDB\Driver\Exception\UnexpectedValueException'), "\n"; echo "\nTesting associative array and nested array with circular reference\n"; @@ -34,7 +34,7 @@ echo "\nTesting associative array and nested array with circular reference\n"; echo throws(function() { $document = ['x' => 1, 'y' => []]; $document['y'][0]['z'] = &$document['y']; - fromPHP($document); + MongoDB\BSON\fromPHP($document); }, 'MongoDB\Driver\Exception\UnexpectedValueException'), "\n"; echo "\nTesting object with circular reference\n"; @@ -42,7 +42,7 @@ echo "\nTesting object with circular reference\n"; echo throws(function() { $document = (object) ['x' => 1, 'y' => (object) []]; $document->y->z = &$document->y; - fromPHP($document); + MongoDB\BSON\fromPHP($document); }, 'MongoDB\Driver\Exception\UnexpectedValueException'), "\n"; echo "\nTesting nested object with circular reference\n"; @@ -50,34 +50,46 @@ echo "\nTesting nested object with circular reference\n"; echo throws(function() { $document = (object) ['x' => 1, 'y' => (object) ['z' => (object) []]]; $document->y->z->a = &$document->y; - fromPHP($document); + MongoDB\BSON\fromPHP($document); }, 'MongoDB\Driver\Exception\UnexpectedValueException'), "\n"; ?> ===DONE=== ---EXPECT-- +--EXPECTF-- Testing packed array with circular reference + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException Detected recursion for field path "y.0" Testing packed array with circular reference at 3rd position + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException Detected recursion for field path "y.3" Testing associative array with circular reference + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException Detected recursion for field path "y.z" Testing associative array and nested array with circular reference + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException Detected recursion for field path "y.0.z" Testing object with circular reference + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException Detected recursion for field path "y.z" Testing nested object with circular reference + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException Detected recursion for field path "y.z.a" ===DONE=== diff --git a/tests/bson/bson-fromPHP_error-005.phpt b/tests/bson/bson-fromPHP_error-005.phpt index d7fea4d72..cdbd530a6 100644 --- a/tests/bson/bson-fromPHP_error-005.phpt +++ b/tests/bson/bson-fromPHP_error-005.phpt @@ -28,24 +28,28 @@ class MyIndirectlyRecursiveSerializable extends MyRecursiveSerializable echo "\nTesting Serializable with direct circular reference\n"; echo throws(function() { - fromPHP(new MyRecursiveSerializable); + MongoDB\BSON\fromPHP(new MyRecursiveSerializable); }, 'MongoDB\Driver\Exception\UnexpectedValueException'), "\n"; echo "\nTesting Serializable with indirect circular reference\n"; echo throws(function() { - fromPHP(new MyIndirectlyRecursiveSerializable); + MongoDB\BSON\fromPHP(new MyIndirectlyRecursiveSerializable); }, 'MongoDB\Driver\Exception\UnexpectedValueException'), "\n"; ?> ===DONE=== ---EXPECT-- +--EXPECTF-- Testing Serializable with direct circular reference + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException Expected MyRecursiveSerializable::bsonSerialize() to return an array, stdClass, MongoDB\BSON\Document, or MongoDB\BSON\PackedArray, MyRecursiveSerializable given Testing Serializable with indirect circular reference + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException Detected recursion for field path "parent.parent" ===DONE=== diff --git a/tests/bson/bson-fromPHP_error-006.phpt b/tests/bson/bson-fromPHP_error-006.phpt index 2453e3a1f..3a449dd1a 100644 --- a/tests/bson/bson-fromPHP_error-006.phpt +++ b/tests/bson/bson-fromPHP_error-006.phpt @@ -9,50 +9,60 @@ require_once __DIR__ . '/../utils/basic.inc'; echo "\nTesting array with one leading null byte in field name\n"; echo throws(function() { - fromPHP(["\0" => 1]); + MongoDB\BSON\fromPHP(["\0" => 1]); }, 'MongoDB\Driver\Exception\UnexpectedValueException'), "\n"; echo "\nTesting array with one trailing null byte in field name\n"; echo throws(function() { - fromPHP(["a\0" => 1]); + MongoDB\BSON\fromPHP(["a\0" => 1]); }, 'MongoDB\Driver\Exception\UnexpectedValueException'), "\n"; echo "\nTesting array with multiple null bytes in field name\n"; echo throws(function() { - fromPHP(["\0\0\0" => 1]); + MongoDB\BSON\fromPHP(["\0\0\0" => 1]); }, 'MongoDB\Driver\Exception\UnexpectedValueException'), "\n"; echo "\nTesting object with one trailing null byte in field name\n"; echo throws(function() { - fromPHP((object) ["a\0" => 1]); + MongoDB\BSON\fromPHP((object) ["a\0" => 1]); }, 'MongoDB\Driver\Exception\UnexpectedValueException'), "\n"; echo "\nTesting nested array with one trailing null byte in field name\n"; echo throws(function() { - fromPHP(['a' => ["b\0" => 1]]); + MongoDB\BSON\fromPHP(['a' => ["b\0" => 1]]); }, 'MongoDB\Driver\Exception\UnexpectedValueException'), "\n"; ?> ===DONE=== ---EXPECT-- +--EXPECTF-- Testing array with one leading null byte in field name + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException BSON keys cannot contain null bytes. Unexpected null byte after "". Testing array with one trailing null byte in field name + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException BSON keys cannot contain null bytes. Unexpected null byte after "a". Testing array with multiple null bytes in field name + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException BSON keys cannot contain null bytes. Unexpected null byte after "". Testing object with one trailing null byte in field name + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException BSON keys cannot contain null bytes. Unexpected null byte after "a". Testing nested array with one trailing null byte in field name + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException BSON keys cannot contain null bytes. Unexpected null byte after "b". ===DONE=== diff --git a/tests/bson/bson-fromPHP_error-007.phpt b/tests/bson/bson-fromPHP_error-007.phpt index 806f0952a..a60b16bc2 100644 --- a/tests/bson/bson-fromPHP_error-007.phpt +++ b/tests/bson/bson-fromPHP_error-007.phpt @@ -23,17 +23,17 @@ class MySerializable implements MongoDB\BSON\Serializable echo "\nTesting array with one leading null byte in field name\n"; echo throws(function() { - fromPHP(new MySerializable(["\0" => 1])); + MongoDB\BSON\fromPHP(new MySerializable(["\0" => 1])); }, 'MongoDB\Driver\Exception\UnexpectedValueException'), "\n"; echo "\nTesting array with one trailing null byte in field name\n"; echo throws(function() { - fromPHP(new MySerializable(["a\0" => 1])); + MongoDB\BSON\fromPHP(new MySerializable(["a\0" => 1])); }, 'MongoDB\Driver\Exception\UnexpectedValueException'), "\n"; echo "\nTesting array with multiple null bytes in field name\n"; echo throws(function() { - fromPHP(new MySerializable(["\0\0\0" => 1])); + MongoDB\BSON\fromPHP(new MySerializable(["\0\0\0" => 1])); }, 'MongoDB\Driver\Exception\UnexpectedValueException'), "\n"; /* Per PHPC-884, field names with a leading null byte are ignored when encoding @@ -43,44 +43,56 @@ echo throws(function() { * protected and private properties. */ echo "\nTesting object with one leading null byte in field name\n"; echo throws(function() { - fromPHP(new MySerializable((object) ["\0" => 1])); + MongoDB\BSON\fromPHP(new MySerializable((object) ["\0" => 1])); }, 'MongoDB\Driver\Exception\UnexpectedValueException'), "\n"; echo "\nTesting object with one trailing null byte in field name\n"; echo throws(function() { - fromPHP(new MySerializable((object) ["a\0" => 1])); + MongoDB\BSON\fromPHP(new MySerializable((object) ["a\0" => 1])); }, 'MongoDB\Driver\Exception\UnexpectedValueException'), "\n"; echo "\nTesting object with multiple null bytes in field name\n"; echo throws(function() { - fromPHP(new MySerializable((object) ["\0\0\0" => 1])); + MongoDB\BSON\fromPHP(new MySerializable((object) ["\0\0\0" => 1])); }, 'MongoDB\Driver\Exception\UnexpectedValueException'), "\n"; ?> ===DONE=== ---EXPECT-- +--EXPECTF-- Testing array with one leading null byte in field name + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException BSON keys cannot contain null bytes. Unexpected null byte after "". Testing array with one trailing null byte in field name + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException BSON keys cannot contain null bytes. Unexpected null byte after "a". Testing array with multiple null bytes in field name + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException BSON keys cannot contain null bytes. Unexpected null byte after "". Testing object with one leading null byte in field name + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException BSON keys cannot contain null bytes. Unexpected null byte after "". Testing object with one trailing null byte in field name + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException BSON keys cannot contain null bytes. Unexpected null byte after "a". Testing object with multiple null bytes in field name + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException BSON keys cannot contain null bytes. Unexpected null byte after "". ===DONE=== diff --git a/tests/bson/bson-fromPHP_error-008.phpt b/tests/bson/bson-fromPHP_error-008.phpt index 393db3cf4..c9cdfabfd 100644 --- a/tests/bson/bson-fromPHP_error-008.phpt +++ b/tests/bson/bson-fromPHP_error-008.phpt @@ -10,7 +10,7 @@ echo "\nTesting packed array with circular reference\n"; echo throws(function() { $document = ['x' => 1, 'y' => [1, 2, 3]]; $document['y'][] = &$document['y']; - fromPHP($document); + MongoDB\BSON\fromPHP($document); }, 'MongoDB\Driver\Exception\UnexpectedValueException'), "\n"; echo "\nTesting associative array with circular reference\n"; @@ -18,7 +18,7 @@ echo "\nTesting associative array with circular reference\n"; echo throws(function() { $document = ['x' => 1, 'y' => []]; $document['y'][0]['z'] = &$document['y']; - fromPHP($document); + MongoDB\BSON\fromPHP($document); }, 'MongoDB\Driver\Exception\UnexpectedValueException'), "\n"; echo "\nTesting object with circular reference\n"; @@ -26,22 +26,28 @@ echo "\nTesting object with circular reference\n"; echo throws(function() { $document = (object) ['x' => 1, 'y' => (object) []]; $document->y->z = &$document->y; - fromPHP($document); + MongoDB\BSON\fromPHP($document); }, 'MongoDB\Driver\Exception\UnexpectedValueException'), "\n"; ?> ===DONE=== ---EXPECT-- +--EXPECTF-- Testing packed array with circular reference + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException Detected recursion for field path "y.3" Testing associative array with circular reference + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException Detected recursion for field path "y.0.z" Testing object with circular reference + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException Detected recursion for field path "y.z" ===DONE=== diff --git a/tests/bson/bson-fromPHP_error-009.phpt b/tests/bson/bson-fromPHP_error-009.phpt index b2de14f97..1cd242419 100644 --- a/tests/bson/bson-fromPHP_error-009.phpt +++ b/tests/bson/bson-fromPHP_error-009.phpt @@ -6,13 +6,14 @@ MongoDB\BSON\fromPHP(): PackedArray cannot be serialized as root document require_once __DIR__ . '/../utils/basic.inc'; echo throws(function() { - fromPHP(MongoDB\BSON\PackedArray::fromPHP([])); + MongoDB\BSON\fromPHP(MongoDB\BSON\PackedArray::fromPHP([])); }, MongoDB\Driver\Exception\UnexpectedValueException::class), "\n"; ?> ===DONE=== ---EXPECT-- +--EXPECTF-- +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException MongoDB\BSON\PackedArray cannot be serialized as a root document ===DONE=== diff --git a/tests/bson/bson-int64-001.phpt b/tests/bson/bson-int64-001.phpt index 8cb3a6900..1ad00a7a3 100644 --- a/tests/bson/bson-int64-001.phpt +++ b/tests/bson/bson-int64-001.phpt @@ -17,13 +17,15 @@ $tests = [ ]; foreach($tests as $test) { - $bson = fromPHP($test); - $testRoundtripped = toPHP($bson); - $bsonRoundtripped = fromPHP($testRoundtripped); + $bson = MongoDB\BSON\fromPHP($test); + $testRoundtripped = MongoDB\BSON\toPHP($bson); + $bsonRoundtripped = MongoDB\BSON\fromPHP($testRoundtripped); + $json = MongoDB\BSON\toJSON($bson); + $jsonRoundtripped = MongoDB\BSON\toJSON($bsonRoundtripped); var_dump($test->int64 instanceof MongoDB\BSON\Int64); var_dump($testRoundtripped->int64 instanceof MongoDB\BSON\Int64); - var_dump(toJSON($bson), toJSON($bsonRoundtripped)); + var_dump($json, $jsonRoundtripped); var_dump($test == $testRoundtripped); echo "\n"; @@ -32,25 +34,64 @@ foreach($tests as $test) { ?> ===DONE=== ---EXPECT-- +--EXPECTF-- +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s bool(true) bool(true) string(33) "{ "int64" : 9223372036854775807 }" string(33) "{ "int64" : 9223372036854775807 }" bool(true) + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s bool(true) bool(true) string(34) "{ "int64" : -9223372036854775808 }" string(34) "{ "int64" : -9223372036854775808 }" bool(true) + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s bool(true) bool(true) string(24) "{ "int64" : 2147483648 }" string(24) "{ "int64" : 2147483648 }" bool(true) + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s bool(true) bool(true) string(25) "{ "int64" : -2147483649 }" diff --git a/tests/bson/bson-int64-002.phpt b/tests/bson/bson-int64-002.phpt index 24161e9b0..6bf7fecc4 100644 --- a/tests/bson/bson-int64-002.phpt +++ b/tests/bson/bson-int64-002.phpt @@ -8,25 +8,28 @@ MongoDB\BSON\Int64 wraps 64-bit integers on 32-bit platforms require_once __DIR__ . '/../utils/basic.inc'; $tests = [ - MongoDB\BSON\toPHP(MongoDB\BSON\fromJSON('{"max64": {"$numberLong": "9223372036854775807"}}')), - MongoDB\BSON\toPHP(MongoDB\BSON\fromJSON('{"min64": {"$numberLong": "-9223372036854775808"}}')), - MongoDB\BSON\toPHP(MongoDB\BSON\fromJSON('{"max32+1": {"$numberLong": "2147483648"}}')), - MongoDB\BSON\toPHP(MongoDB\BSON\fromJSON('{"min32-1": {"$numberLong": "-2147483649"}}')), + '{"max64": {"$numberLong": "9223372036854775807"}}', + '{"min64": {"$numberLong": "-9223372036854775808"}}', + '{"max32+1": {"$numberLong": "2147483648"}}', + '{"min32-1": {"$numberLong": "-2147483649"}}', // Numbers within the range of 32-bit integers will not be wrapped - MongoDB\BSON\toPHP(MongoDB\BSON\fromJSON('{"max32": {"$numberLong": "2147483647"}}')), - MongoDB\BSON\toPHP(MongoDB\BSON\fromJSON('{"min32": {"$numberLong": "-2147483648"}}')), - MongoDB\BSON\toPHP(MongoDB\BSON\fromJSON('{"zero": {"$numberLong": "0"}}')), + '{"max32": {"$numberLong": "2147483647"}}', + '{"min32": {"$numberLong": "-2147483648"}}', + '{"zero": {"$numberLong": "0"}}', ]; foreach ($tests as $test) { - var_dump($test); + var_dump(MongoDB\BSON\toPHP(MongoDB\BSON\fromJSON($test))); } ?> ===DONE=== --EXPECTF-- +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (%d) { ["max64"]=> object(MongoDB\BSON\Int64)#%d (%d) { @@ -34,6 +37,10 @@ object(stdClass)#%d (%d) { string(19) "9223372036854775807" } } + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (%d) { ["min64"]=> object(MongoDB\BSON\Int64)#%d (%d) { @@ -41,6 +48,10 @@ object(stdClass)#%d (%d) { string(20) "-9223372036854775808" } } + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (%d) { ["max32+1"]=> object(MongoDB\BSON\Int64)#%d (%d) { @@ -48,6 +59,10 @@ object(stdClass)#%d (%d) { string(10) "2147483648" } } + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (%d) { ["min32-1"]=> object(MongoDB\BSON\Int64)#%d (%d) { @@ -55,14 +70,26 @@ object(stdClass)#%d (%d) { string(11) "-2147483649" } } + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (%d) { ["max32"]=> int(2147483647) } + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (%d) { ["min32"]=> int(-2147483648) } + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (%d) { ["zero"]=> int(0) diff --git a/tests/bson/bson-javascript-jsonserialize-004.phpt b/tests/bson/bson-javascript-jsonserialize-004.phpt index fb84ec7fe..ecd689995 100644 --- a/tests/bson/bson-javascript-jsonserialize-004.phpt +++ b/tests/bson/bson-javascript-jsonserialize-004.phpt @@ -16,7 +16,7 @@ var_dump(toPHP(fromJSON($json))); ===DONE=== --EXPECTF-- -{ "foo" : { "$code" : "function(bar) { return bar; }", "$scope" : { "foo" : 42 } } } +{ "foo" : { "$code" : "function(bar) { return bar; }", "$scope" : { "foo" : { "$numberInt" : "42" } } } } {"foo":{"$code":"function(bar) { return bar; }","$scope":{"foo":42}}} object(stdClass)#%d (%d) { ["foo"]=> diff --git a/tests/bson/bson-regex-001.phpt b/tests/bson/bson-regex-001.phpt index a1fcaff07..8297f1313 100644 --- a/tests/bson/bson-regex-001.phpt +++ b/tests/bson/bson-regex-001.phpt @@ -29,8 +29,8 @@ foreach($tests as $n => $test) { Pattern: regexp Flags: i String representation: /regexp/i -Test#0 { "regex" : { "$regex" : "regexp", "$options" : "i" } } -string(55) "{ "regex" : { "$regex" : "regexp", "$options" : "i" } }" -string(55) "{ "regex" : { "$regex" : "regexp", "$options" : "i" } }" +Test#0 { "regex" : { "$regularExpression" : { "pattern" : "regexp", "options" : "i" } } } +string(82) "{ "regex" : { "$regularExpression" : { "pattern" : "regexp", "options" : "i" } } }" +string(82) "{ "regex" : { "$regularExpression" : { "pattern" : "regexp", "options" : "i" } } }" bool(true) ===DONE=== diff --git a/tests/bson/bson-regex-003.phpt b/tests/bson/bson-regex-003.phpt index 2e5d00e9b..6aec3aabd 100644 --- a/tests/bson/bson-regex-003.phpt +++ b/tests/bson/bson-regex-003.phpt @@ -29,8 +29,8 @@ foreach($tests as $n => $test) { Pattern: regexp Flags: String representation: /regexp/ -Test#0 { "regex" : { "$regex" : "regexp", "$options" : "" } } -string(54) "{ "regex" : { "$regex" : "regexp", "$options" : "" } }" -string(54) "{ "regex" : { "$regex" : "regexp", "$options" : "" } }" +Test#0 { "regex" : { "$regularExpression" : { "pattern" : "regexp", "options" : "" } } } +string(81) "{ "regex" : { "$regularExpression" : { "pattern" : "regexp", "options" : "" } } }" +string(81) "{ "regex" : { "$regularExpression" : { "pattern" : "regexp", "options" : "" } } }" bool(true) ===DONE=== diff --git a/tests/bson/bson-regex-jsonserialize-003.phpt b/tests/bson/bson-regex-jsonserialize-003.phpt index 5ecc29567..317b3908d 100644 --- a/tests/bson/bson-regex-jsonserialize-003.phpt +++ b/tests/bson/bson-regex-jsonserialize-003.phpt @@ -16,7 +16,7 @@ var_dump(toPHP(fromJSON($json))); ===DONE=== --EXPECTF-- -{ "foo" : { "$regex" : "pattern", "$options" : "" } } +{ "foo" : { "$regularExpression" : { "pattern" : "pattern", "options" : "" } } } {"foo":{"$regex":"pattern","$options":""}} object(stdClass)#%d (%d) { ["foo"]=> diff --git a/tests/bson/bson-regex-jsonserialize-004.phpt b/tests/bson/bson-regex-jsonserialize-004.phpt index 1ed38c7d8..8520a14d3 100644 --- a/tests/bson/bson-regex-jsonserialize-004.phpt +++ b/tests/bson/bson-regex-jsonserialize-004.phpt @@ -16,7 +16,7 @@ var_dump(toPHP(fromJSON($json))); ===DONE=== --EXPECTF-- -{ "foo" : { "$regex" : "pattern", "$options" : "i" } } +{ "foo" : { "$regularExpression" : { "pattern" : "pattern", "options" : "i" } } } {"foo":{"$regex":"pattern","$options":"i"}} object(stdClass)#%d (%d) { ["foo"]=> diff --git a/tests/bson/bson-symbol-001.phpt b/tests/bson/bson-symbol-001.phpt index 951843724..bc16b0e20 100644 --- a/tests/bson/bson-symbol-001.phpt +++ b/tests/bson/bson-symbol-001.phpt @@ -6,7 +6,7 @@ MongoDB\BSON\Symbol #001 require_once __DIR__ . '/../utils/basic.inc'; $tests = array( - MongoDB\BSON\toPHP(MongoDB\BSON\fromJSON('{ "symbol": {"$symbol": "test"} }')), + MongoDB\BSON\Document::fromJSON('{ "symbol": {"$symbol": "test"} }')->toPHP(), ); foreach($tests as $n => $test) { @@ -21,8 +21,8 @@ foreach($tests as $n => $test) { ===DONE=== --EXPECT-- -Test#0 { "symbol" : "test" } -string(21) "{ "symbol" : "test" }" -string(21) "{ "symbol" : "test" }" +Test#0 { "symbol" : { "$symbol" : "test" } } +string(37) "{ "symbol" : { "$symbol" : "test" } }" +string(37) "{ "symbol" : { "$symbol" : "test" } }" bool(true) ===DONE=== diff --git a/tests/bson/bson-symbol-clone-001.phpt b/tests/bson/bson-symbol-clone-001.phpt index 7c3249c8e..951f5db34 100644 --- a/tests/bson/bson-symbol-clone-001.phpt +++ b/tests/bson/bson-symbol-clone-001.phpt @@ -8,7 +8,7 @@ MongoDB\BSON\Symbol can be cloned (PHP < 8.2) require_once __DIR__ . '/../utils/basic.inc'; -$test = MongoDB\BSON\toPHP(MongoDB\BSON\fromJSON('{ "symbol": {"$symbol": "test"} }')); +$test = MongoDB\BSON\Document::fromJSON('{ "symbol": {"$symbol": "test"} }')->toPHP(); $symbol = $test->symbol; diff --git a/tests/bson/bson-symbol-clone-002.phpt b/tests/bson/bson-symbol-clone-002.phpt index 440453888..78c460a59 100644 --- a/tests/bson/bson-symbol-clone-002.phpt +++ b/tests/bson/bson-symbol-clone-002.phpt @@ -8,7 +8,7 @@ MongoDB\BSON\Symbol can be cloned (PHP >= 8.2) require_once __DIR__ . '/../utils/basic.inc'; -$test = MongoDB\BSON\toPHP(MongoDB\BSON\fromJSON('{ "symbol": {"$symbol": "test"} }')); +$test = MongoDB\BSON\Document::fromJSON('{ "symbol": {"$symbol": "test"} }')->toPHP(); $symbol = $test->symbol; diff --git a/tests/bson/bson-symbol-compare-001.phpt b/tests/bson/bson-symbol-compare-001.phpt index 2a57dcd7f..ac4bc308f 100644 --- a/tests/bson/bson-symbol-compare-001.phpt +++ b/tests/bson/bson-symbol-compare-001.phpt @@ -3,9 +3,9 @@ MongoDB\BSON\Symbol comparisons --FILE-- MongoDB\BSON\toPHP(MongoDB\BSON\fromJSON('{ "symbol": {"$symbol": "val0"} }'))); +var_dump(MongoDB\BSON\Document::fromJSON('{ "symbol": {"$symbol": "val1"} }')->toPHP() == MongoDB\BSON\Document::fromJSON('{ "symbol": {"$symbol": "val1"} }')->toPHP()); +var_dump(MongoDB\BSON\Document::fromJSON('{ "symbol": {"$symbol": "val1"} }')->toPHP() < MongoDB\BSON\Document::fromJSON('{ "symbol": {"$symbol": "val2"} }')->toPHP()); +var_dump(MongoDB\BSON\Document::fromJSON('{ "symbol": {"$symbol": "val1"} }')->toPHP() > MongoDB\BSON\Document::fromJSON('{ "symbol": {"$symbol": "val0"} }')->toPHP()); ?> ===DONE=== diff --git a/tests/bson/bson-symbol-get_properties-001.phpt b/tests/bson/bson-symbol-get_properties-001.phpt index 24a306860..dc2072843 100644 --- a/tests/bson/bson-symbol-get_properties-001.phpt +++ b/tests/bson/bson-symbol-get_properties-001.phpt @@ -3,7 +3,7 @@ MongoDB\BSON\Symbol get_properties handler (get_object_vars) --FILE-- toPHP(); $symbol = $document->symbol; var_dump(get_object_vars($symbol)); diff --git a/tests/bson/bson-symbol-get_properties-002.phpt b/tests/bson/bson-symbol-get_properties-002.phpt index f55ef70a3..daace5bb1 100644 --- a/tests/bson/bson-symbol-get_properties-002.phpt +++ b/tests/bson/bson-symbol-get_properties-002.phpt @@ -3,7 +3,7 @@ MongoDB\BSON\Symbol get_properties handler (foreach) --FILE-- toPHP(); $symbol = $document->symbol; foreach ($symbol as $key => $value) { diff --git a/tests/bson/bson-symbol-jsonserialize-001.phpt b/tests/bson/bson-symbol-jsonserialize-001.phpt index 9262beaf5..095096e06 100644 --- a/tests/bson/bson-symbol-jsonserialize-001.phpt +++ b/tests/bson/bson-symbol-jsonserialize-001.phpt @@ -3,7 +3,7 @@ MongoDB\BSON\Symbol::jsonSerialize() return value --FILE-- symbol; +$js = MongoDB\BSON\Document::fromJSON('{ "symbol": {"$symbol": "valSymbol"} }')->toPHP()->symbol; var_dump($js->jsonSerialize()); ?> diff --git a/tests/bson/bson-symbol-jsonserialize-002.phpt b/tests/bson/bson-symbol-jsonserialize-002.phpt index ed99fdf74..91b8f77bb 100644 --- a/tests/bson/bson-symbol-jsonserialize-002.phpt +++ b/tests/bson/bson-symbol-jsonserialize-002.phpt @@ -5,7 +5,7 @@ MongoDB\BSON\Symbol::jsonSerialize() with json_encode() require_once __DIR__ . '/../utils/basic.inc'; -$doc = MongoDB\BSON\toPHP(MongoDB\BSON\fromJSON('{ "foo": {"$symbol": "symbolValue"} }')); +$doc = MongoDB\BSON\Document::fromJSON('{ "foo": {"$symbol": "symbolValue"} }')->toPHP(); $json = json_encode($doc); echo toJSON(fromPHP($doc)), "\n"; @@ -16,7 +16,7 @@ var_dump(toPHP(fromJSON($json))); ===DONE=== --EXPECTF-- -{ "foo" : "symbolValue" } +{ "foo" : { "$symbol" : "symbolValue" } } {"foo":{"$symbol":"symbolValue"}} object(stdClass)#%d (%d) { ["foo"]=> diff --git a/tests/bson/bson-symbol-serialization-002.phpt b/tests/bson/bson-symbol-serialization-002.phpt index dfc66847c..441a40efe 100644 --- a/tests/bson/bson-symbol-serialization-002.phpt +++ b/tests/bson/bson-symbol-serialization-002.phpt @@ -3,7 +3,7 @@ MongoDB\BSON\Symbol serialization (__serialize and __unserialize) --FILE-- symbol; +$test = MongoDB\BSON\Document::fromJSON('{ "symbol": {"$symbol": "symbolValue"} }')->toPHP()->symbol; var_dump($symbol = $test); var_dump($s = serialize($symbol)); diff --git a/tests/bson/bson-symbol-set_state-001.phpt b/tests/bson/bson-symbol-set_state-001.phpt index ee28f5f62..45070ed2c 100644 --- a/tests/bson/bson-symbol-set_state-001.phpt +++ b/tests/bson/bson-symbol-set_state-001.phpt @@ -3,7 +3,7 @@ MongoDB\BSON\Symbol::__set_state() --FILE-- symbol; +$symbol = MongoDB\BSON\Document::fromJSON('{ "symbol": {"$symbol": "test"} }')->toPHP()->symbol; $s = var_export($symbol, true); echo $s, "\n"; diff --git a/tests/bson/bson-symbol-tostring-001.phpt b/tests/bson/bson-symbol-tostring-001.phpt index e7eea50e9..700f01f54 100644 --- a/tests/bson/bson-symbol-tostring-001.phpt +++ b/tests/bson/bson-symbol-tostring-001.phpt @@ -3,7 +3,7 @@ MongoDB\BSON\Symbol::__toString() --FILE-- symbol; +$symbol = MongoDB\BSON\Document::fromJSON('{ "symbol": {"$symbol": "symbolValue"} }')->toPHP()->symbol; var_dump((string) $symbol); ?> diff --git a/tests/bson/bson-toCanonicalJSON-001.phpt b/tests/bson/bson-toCanonicalJSON-001.phpt index 5224e09b5..b0383463d 100644 --- a/tests/bson/bson-toCanonicalJSON-001.phpt +++ b/tests/bson/bson-toCanonicalJSON-001.phpt @@ -20,23 +20,66 @@ $tests = [ ]; foreach ($tests as $value) { - $bson = fromPHP($value); - echo toCanonicalExtendedJSON($bson), "\n"; + $bson = MongoDB\BSON\fromPHP($value); + echo MongoDB\BSON\toCanonicalExtendedJSON($bson), "\n"; } ?> ===DONE=== ---EXPECT-- +--EXPECTF-- +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toCanonicalExtendedJSON() is deprecated in %s { } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toCanonicalExtendedJSON() is deprecated in %s { "null" : null } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toCanonicalExtendedJSON() is deprecated in %s { "boolean" : true } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toCanonicalExtendedJSON() is deprecated in %s { "string" : "foo" } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toCanonicalExtendedJSON() is deprecated in %s { "integer" : { "$numberInt" : "123" } } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toCanonicalExtendedJSON() is deprecated in %s { "double" : { "$numberDouble" : "1.0" } } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toCanonicalExtendedJSON() is deprecated in %s { "nan" : { "$numberDouble" : "NaN" } } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toCanonicalExtendedJSON() is deprecated in %s { "pos_inf" : { "$numberDouble" : "Infinity" } } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toCanonicalExtendedJSON() is deprecated in %s { "neg_inf" : { "$numberDouble" : "-Infinity" } } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toCanonicalExtendedJSON() is deprecated in %s { "array" : [ "foo", "bar" ] } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toCanonicalExtendedJSON() is deprecated in %s { "document" : { "foo" : "bar" } } ===DONE=== diff --git a/tests/bson/bson-toCanonicalJSON-002.phpt b/tests/bson/bson-toCanonicalJSON-002.phpt index f81a7161e..d9807ce2a 100644 --- a/tests/bson/bson-toCanonicalJSON-002.phpt +++ b/tests/bson/bson-toCanonicalJSON-002.phpt @@ -18,21 +18,56 @@ $tests = [ ]; foreach ($tests as $value) { - $bson = fromPHP($value); - echo toCanonicalExtendedJSON($bson), "\n"; + $bson = MongoDB\BSON\fromPHP($value); + echo MongoDB\BSON\toCanonicalExtendedJSON($bson), "\n"; } ?> ===DONE=== ---EXPECT-- +--EXPECTF-- +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toCanonicalExtendedJSON() is deprecated in %s { "_id" : { "$oid" : "56315a7c6118fd1b920270b1" } } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toCanonicalExtendedJSON() is deprecated in %s { "binary" : { "$binary" : { "base64" : "Zm9v", "subType" : "00" } } } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toCanonicalExtendedJSON() is deprecated in %s { "date" : { "$date" : { "$numberLong" : "1445990400000" } } } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toCanonicalExtendedJSON() is deprecated in %s { "timestamp" : { "$timestamp" : { "t" : 5678, "i" : 1234 } } } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toCanonicalExtendedJSON() is deprecated in %s { "regex" : { "$regularExpression" : { "pattern" : "pattern", "options" : "i" } } } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toCanonicalExtendedJSON() is deprecated in %s { "code" : { "$code" : "function() { return 1; }" } } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toCanonicalExtendedJSON() is deprecated in %s { "code_ws" : { "$code" : "function() { return a; }", "$scope" : { "a" : { "$numberInt" : "1" } } } } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toCanonicalExtendedJSON() is deprecated in %s { "minkey" : { "$minKey" : 1 } } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toCanonicalExtendedJSON() is deprecated in %s { "maxkey" : { "$maxKey" : 1 } } ===DONE=== diff --git a/tests/bson/bson-toCanonicalJSON_error-001.phpt b/tests/bson/bson-toCanonicalJSON_error-001.phpt index 23eecd65b..c92aafdf6 100644 --- a/tests/bson/bson-toCanonicalJSON_error-001.phpt +++ b/tests/bson/bson-toCanonicalJSON_error-001.phpt @@ -9,21 +9,26 @@ require_once __DIR__ . '/../utils/basic.inc'; * bson_reader_read() already checks that the buffer is at least 5 bytes. */ $tests = [ '', - str_repeat(fromJSON('{"x": "y"}'), 2), + str_repeat(MongoDB\BSON\fromJSON('{"x": "y"}'), 2), ]; foreach ($tests as $bson) { echo throws(function() use ($bson) { - toCanonicalExtendedJSON($bson); + MongoDB\BSON\toCanonicalExtendedJSON($bson); }, 'MongoDB\Driver\Exception\UnexpectedValueException'), "\n"; } ?> ===DONE=== ---EXPECT-- +--EXPECTF-- +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toCanonicalExtendedJSON() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException Could not read document from BSON reader + +Deprecated: Function MongoDB\BSON\toCanonicalExtendedJSON() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException Reading document did not exhaust input buffer ===DONE=== diff --git a/tests/bson/bson-toCanonicalJSON_error-002.phpt b/tests/bson/bson-toCanonicalJSON_error-002.phpt index e92a97647..b4b0c131f 100644 --- a/tests/bson/bson-toCanonicalJSON_error-002.phpt +++ b/tests/bson/bson-toCanonicalJSON_error-002.phpt @@ -12,16 +12,19 @@ $tests = [ foreach ($tests as $bson) { echo throws(function() use ($bson) { - toCanonicalExtendedJSON($bson); + MongoDB\BSON\toCanonicalExtendedJSON($bson); }, 'MongoDB\Driver\Exception\UnexpectedValueException'), "\n"; } ?> ===DONE=== ---EXPECT-- +--EXPECTF-- +Deprecated: Function MongoDB\BSON\toCanonicalExtendedJSON() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException Could not read document from BSON reader + +Deprecated: Function MongoDB\BSON\toCanonicalExtendedJSON() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException Could not read document from BSON reader ===DONE=== diff --git a/tests/bson/bson-toCanonicalJSON_error-003.phpt b/tests/bson/bson-toCanonicalJSON_error-003.phpt index 2c2dc5500..9cda07b86 100644 --- a/tests/bson/bson-toCanonicalJSON_error-003.phpt +++ b/tests/bson/bson-toCanonicalJSON_error-003.phpt @@ -21,18 +21,23 @@ $tests = [ foreach ($tests as $bson) { echo throws(function() use ($bson) { - toCanonicalExtendedJSON($bson); + MongoDB\BSON\toCanonicalExtendedJSON($bson); }, 'MongoDB\Driver\Exception\UnexpectedValueException'), "\n"; } ?> ===DONE=== ---EXPECT-- +--EXPECTF-- +Deprecated: Function MongoDB\BSON\toCanonicalExtendedJSON() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException Could not convert BSON document to a JSON string + +Deprecated: Function MongoDB\BSON\toCanonicalExtendedJSON() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException Could not convert BSON document to a JSON string + +Deprecated: Function MongoDB\BSON\toCanonicalExtendedJSON() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException Could not convert BSON document to a JSON string ===DONE=== diff --git a/tests/bson/bson-toJSON-001.phpt b/tests/bson/bson-toJSON-001.phpt index 193688a63..23ed10a7e 100644 --- a/tests/bson/bson-toJSON-001.phpt +++ b/tests/bson/bson-toJSON-001.phpt @@ -12,8 +12,8 @@ $tests = [ [ 'string' => 'foo' ], [ 'integer' => 123 ], [ 'double' => 1.0, ], - /* Note: toJSON() does not properly handle NAN and INF values. - * toCanonicalExtendedJSON() or toRelaxedExtendedJSON() should be used + /* Note: MongoDB\BSON\toJSON() does not properly handle NAN and INF values. + * MongoDB\BSON\toCanonicalExtendedJSON() or MongoDB\BSON\toRelaxedExtendedJSON() should be used * instead. */ [ 'nan' => NAN ], [ 'pos_inf' => INF ], @@ -23,23 +23,66 @@ $tests = [ ]; foreach ($tests as $value) { - $bson = fromPHP($value); - echo toJSON($bson), "\n"; + $bson = MongoDB\BSON\fromPHP($value); + echo MongoDB\BSON\toJSON($bson), "\n"; } ?> ===DONE=== --EXPECTF-- +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s { } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s { "null" : null } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s { "boolean" : true } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s { "string" : "foo" } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s { "integer" : 123 } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s { "double" : 1.0 } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s { "nan" : %r-?nan(\(ind\))?%r } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s { "pos_inf" : inf } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s { "neg_inf" : -inf } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s { "array" : [ "foo", "bar" ] } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s { "document" : { "foo" : "bar" } } ===DONE=== diff --git a/tests/bson/bson-toJSON-002.phpt b/tests/bson/bson-toJSON-002.phpt index f751e829f..1d13e504a 100644 --- a/tests/bson/bson-toJSON-002.phpt +++ b/tests/bson/bson-toJSON-002.phpt @@ -18,21 +18,56 @@ $tests = [ ]; foreach ($tests as $value) { - $bson = fromPHP($value); - echo toJSON($bson), "\n"; + $bson = MongoDB\BSON\fromPHP($value); + echo MongoDB\BSON\toJSON($bson), "\n"; } ?> ===DONE=== ---EXPECT-- +--EXPECTF-- +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s { "_id" : { "$oid" : "56315a7c6118fd1b920270b1" } } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s { "binary" : { "$binary" : "Zm9v", "$type" : "00" } } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s { "date" : { "$date" : 1445990400000 } } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s { "timestamp" : { "$timestamp" : { "t" : 5678, "i" : 1234 } } } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s { "regex" : { "$regex" : "pattern", "$options" : "i" } } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s { "code" : { "$code" : "function() { return 1; }" } } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s { "code_ws" : { "$code" : "function() { return a; }", "$scope" : { "a" : 1 } } } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s { "minkey" : { "$minKey" : 1 } } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s { "maxkey" : { "$maxKey" : 1 } } ===DONE=== diff --git a/tests/bson/bson-toJSON-003.phpt b/tests/bson/bson-toJSON-003.phpt index 60cf80e78..afd10cf0c 100644 --- a/tests/bson/bson-toJSON-003.phpt +++ b/tests/bson/bson-toJSON-003.phpt @@ -7,11 +7,14 @@ require_once __DIR__ . '/../utils/basic.inc'; /* Note: this is a regression test for libmongoc's JSON encoder. It is not * advisable to use duplicate keys in BSON documents. */ -echo toJSON(fromJSON('{ "foo": "bar", "foo": "baz" }')), "\n"; +echo MongoDB\BSON\toJSON(MongoDB\BSON\fromJSON('{ "foo": "bar", "foo": "baz" }')), "\n"; ?> ===DONE=== ---EXPECT-- +--EXPECTF-- +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s { "foo" : "bar", "foo" : "baz" } ===DONE=== diff --git a/tests/bson/bson-toJSON_error-001.phpt b/tests/bson/bson-toJSON_error-001.phpt index b340a06a0..0175f8a5f 100644 --- a/tests/bson/bson-toJSON_error-001.phpt +++ b/tests/bson/bson-toJSON_error-001.phpt @@ -9,21 +9,26 @@ require_once __DIR__ . '/../utils/basic.inc'; * bson_reader_read() already checks that the buffer is at least 5 bytes. */ $tests = [ '', - str_repeat(fromJSON('{"x": "y"}'), 2), + str_repeat(MongoDB\BSON\fromJSON('{"x": "y"}'), 2), ]; foreach ($tests as $bson) { echo throws(function() use ($bson) { - toJSON($bson); + MongoDB\BSON\toJSON($bson); }, 'MongoDB\Driver\Exception\UnexpectedValueException'), "\n"; } ?> ===DONE=== ---EXPECT-- +--EXPECTF-- +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException Could not read document from BSON reader + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException Reading document did not exhaust input buffer ===DONE=== diff --git a/tests/bson/bson-toJSON_error-002.phpt b/tests/bson/bson-toJSON_error-002.phpt index 1e405b938..6f1b76e19 100644 --- a/tests/bson/bson-toJSON_error-002.phpt +++ b/tests/bson/bson-toJSON_error-002.phpt @@ -12,16 +12,19 @@ $tests = [ foreach ($tests as $bson) { echo throws(function() use ($bson) { - toJSON($bson); + MongoDB\BSON\toJSON($bson); }, 'MongoDB\Driver\Exception\UnexpectedValueException'), "\n"; } ?> ===DONE=== ---EXPECT-- +--EXPECTF-- +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException Could not read document from BSON reader + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException Could not read document from BSON reader ===DONE=== diff --git a/tests/bson/bson-toJSON_error-003.phpt b/tests/bson/bson-toJSON_error-003.phpt index 000b1d6d2..8f85cdc5d 100644 --- a/tests/bson/bson-toJSON_error-003.phpt +++ b/tests/bson/bson-toJSON_error-003.phpt @@ -21,18 +21,23 @@ $tests = [ foreach ($tests as $bson) { echo throws(function() use ($bson) { - toJSON($bson); + MongoDB\BSON\toJSON($bson); }, 'MongoDB\Driver\Exception\UnexpectedValueException'), "\n"; } ?> ===DONE=== ---EXPECT-- +--EXPECTF-- +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException Could not convert BSON document to a JSON string + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException Could not convert BSON document to a JSON string + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException Could not convert BSON document to a JSON string ===DONE=== diff --git a/tests/bson/bson-toPHP-001.phpt b/tests/bson/bson-toPHP-001.phpt index e2d1c0744..511c1b893 100644 --- a/tests/bson/bson-toPHP-001.phpt +++ b/tests/bson/bson-toPHP-001.phpt @@ -32,7 +32,7 @@ $tests = array( foreach ($tests as $test) { echo $test, "\n"; - var_dump(toPHP(fromJSON($test))); + var_dump(MongoDB\BSON\toPHP(MongoDB\BSON\fromJSON($test))); echo "\n"; } @@ -41,6 +41,10 @@ foreach ($tests as $test) { --EXPECTF-- { "foo": "yes", "__pclass": { "$binary": "TXlBYnN0cmFjdERvY3VtZW50", "$type": "80" } } + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (2) { ["foo"]=> string(3) "yes" @@ -54,6 +58,10 @@ object(stdClass)#%d (2) { } { "foo": "yes", "__pclass": { "$binary": "TXlEb2N1bWVudA==", "$type": "80" } } + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (2) { ["foo"]=> string(3) "yes" @@ -67,6 +75,10 @@ object(stdClass)#%d (2) { } { "foo": "yes", "__pclass": { "$binary": "TW9uZ29EQlxCU09OXFVuc2VyaWFsaXphYmxl", "$type": "80" } } + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (2) { ["foo"]=> string(3) "yes" @@ -80,6 +92,10 @@ object(stdClass)#%d (2) { } { "foo": "yes", "__pclass": { "$binary": "TW9uZ29EQlxCU09OXFBlcnNpc3RhYmxl", "$type": "44" } } + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (2) { ["foo"]=> string(3) "yes" diff --git a/tests/bson/bson-toPHP-002.phpt b/tests/bson/bson-toPHP-002.phpt index 7bdcd3c4d..f088e06bf 100644 --- a/tests/bson/bson-toPHP-002.phpt +++ b/tests/bson/bson-toPHP-002.phpt @@ -33,8 +33,8 @@ class MyDocument implements MongoDB\BSON\Persistable } } -$bson = fromPHP(new MyDocument); -echo "Test ", toJSON($bson), "\n"; +$bson = MongoDB\BSON\fromPHP(new MyDocument); +echo "Test " . MongoDB\BSON\toJSON($bson) . "\n"; hex_dump($bson); $typeMap = array( @@ -43,12 +43,16 @@ $typeMap = array( 'root' => null, ); -var_dump(toPHP($bson, $typeMap)); +var_dump(MongoDB\BSON\toPHP($bson, $typeMap)); ?> ===DONE=== --EXPECTF-- + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s Test { "__pclass" : { "$binary" : "TXlEb2N1bWVudA==", "$type" : "80" }, "list" : [ 1, 2, 3 ], "map" : { "foo" : "bar" } } 0 : 55 00 00 00 05 5f 5f 70 63 6c 61 73 73 00 0a 00 [U....__pclass...] 10 : 00 00 80 4d 79 44 6f 63 75 6d 65 6e 74 04 6c 69 [...MyDocument.li] @@ -56,6 +60,8 @@ Test { "__pclass" : { "$binary" : "TXlEb2N1bWVudA==", "$type" : "80" }, "list" : 30 : 00 02 00 00 00 10 32 00 03 00 00 00 00 03 6d 61 [......2.......ma] 40 : 70 00 12 00 00 00 02 66 6f 6f 00 04 00 00 00 62 [p......foo.....b] 50 : 61 72 00 00 00 [ar...] + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(MyDocument)#%d (1) { ["data"]=> array(2) { diff --git a/tests/bson/bson-toPHP-003.phpt b/tests/bson/bson-toPHP-003.phpt index d2045411d..302600f46 100644 --- a/tests/bson/bson-toPHP-003.phpt +++ b/tests/bson/bson-toPHP-003.phpt @@ -139,9 +139,9 @@ foreach ($testGroups as $testGroup) { foreach ($testGroup['tests'] as $test) { echo $test, "\n"; - $bson = fromJSON($test); + $bson = MongoDB\BSON\fromJSON($test); try { - var_dump(toPHP($bson, $testGroup['typemap'])); + var_dump(MongoDB\BSON\toPHP($bson, $testGroup['typemap'])); } catch (MongoDB\Driver\Exception\Exception $e) { echo $e->getMessage(), "\n"; } @@ -159,6 +159,10 @@ foreach ($testGroups as $testGroup) { === DEFAULT TYPEMAP === { "foo": "yes", "bar" : false } + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (2) { ["foo"]=> string(3) "yes" @@ -167,6 +171,10 @@ object(stdClass)#%d (2) { } { "foo": "no", "array" : [ 5, 6 ] } + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (2) { ["foo"]=> string(2) "no" @@ -180,6 +188,10 @@ object(stdClass)#%d (2) { } { "foo": "no", "obj" : { "embedded" : 4.125 } } + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (2) { ["foo"]=> string(2) "no" @@ -191,6 +203,10 @@ object(stdClass)#%d (2) { } { "foo": "yes", "__pclass": "MyClass" } + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (2) { ["foo"]=> string(3) "yes" @@ -199,6 +215,10 @@ object(stdClass)#%d (2) { } { "foo": "yes", "__pclass": { "$binary": "TXlDbGFzcw==", "$type": "80" } } + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (2) { ["foo"]=> string(3) "yes" @@ -212,6 +232,10 @@ object(stdClass)#%d (2) { } { "foo": "yes", "__pclass": { "$binary": "WW91ckNsYXNz", "$type": "80" } } + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (2) { ["foo"]=> string(3) "yes" @@ -225,6 +249,10 @@ object(stdClass)#%d (2) { } { "foo": "yes", "__pclass": { "$binary": "T3VyQ2xhc3M=", "$type": "80" } } + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(OurClass)#%d (3) { ["foo"]=> string(3) "yes" @@ -240,6 +268,10 @@ object(OurClass)#%d (3) { } { "foo": "yes", "__pclass": { "$binary": "WW91ckNsYXNz", "$type": "44" } } + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (2) { ["foo"]=> string(3) "yes" @@ -256,24 +288,40 @@ object(stdClass)#%d (2) { === NONEXISTING CLASS === { "foo": "yes" } + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s Class MissingClass does not exist === DOES NOT IMPLEMENT UNSERIALIZABLE === { "foo": "yes", "__pclass": { "$binary": "TXlDbGFzcw==", "$type": "80" } } + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s Class MyClass does not implement MongoDB\BSON\Unserializable === IS NOT A CONCRETE CLASS === { "foo": "yes" } + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s Interface MongoDB\BSON\Unserializable is not instantiatable === IS NOT A CONCRETE CLASS VIA PCLASS === { "foo": "yes", "__pclass" : { "$binary": "TW9uZ29EQlxCU09OXFVuc2VyaWFsaXphYmxl", "$type": "80" } } + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(YourClass)#%d (3) { ["foo"]=> string(3) "yes" @@ -292,6 +340,10 @@ object(YourClass)#%d (3) { === PCLASS OVERRIDES TYPEMAP (1) === { "foo": "yes", "__pclass" : { "$binary": "TXlDbGFzcw==", "$type": "80" } } + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(YourClass)#%d (3) { ["foo"]=> string(3) "yes" @@ -307,6 +359,10 @@ object(YourClass)#%d (3) { } { "foo": "yes", "__pclass" : { "$binary": "T3VyQ2xhc3M=", "$type": "80" } } + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(OurClass)#%d (3) { ["foo"]=> string(3) "yes" @@ -322,6 +378,10 @@ object(OurClass)#%d (3) { } { "foo": "yes", "__pclass" : { "$binary": "VGhlaXJDbGFzcw==", "$type": "80" } } + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(TheirClass)#%d (3) { ["foo"]=> string(3) "yes" @@ -337,6 +397,10 @@ object(TheirClass)#%d (3) { } { "foo": "yes", "__pclass" : { "$binary": "WW91ckNsYXNz", "$type": "80" } } + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(YourClass)#%d (3) { ["foo"]=> string(3) "yes" @@ -355,6 +419,10 @@ object(YourClass)#%d (3) { === PCLASS OVERRIDES TYPEMAP (2) === { "foo": "yes", "__pclass" : { "$binary": "VGhlaXJDbGFzcw==", "$type": "80" } } + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(TheirClass)#%d (3) { ["foo"]=> string(3) "yes" @@ -373,6 +441,10 @@ object(TheirClass)#%d (3) { === OBJECTS AS ARRAY === { "foo": "yes", "bar" : false } + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s array(2) { ["foo"]=> string(3) "yes" @@ -381,6 +453,10 @@ array(2) { } { "foo": "no", "array" : [ 5, 6 ] } + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s array(2) { ["foo"]=> string(2) "no" @@ -394,6 +470,10 @@ array(2) { } { "foo": "no", "obj" : { "embedded" : 4.125 } } + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s array(2) { ["foo"]=> string(2) "no" @@ -405,6 +485,10 @@ array(2) { } { "foo": "yes", "__pclass": "MyClass" } + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s array(2) { ["foo"]=> string(3) "yes" @@ -413,6 +497,10 @@ array(2) { } { "foo": "yes", "__pclass" : { "$binary": "TXlDbGFzcw==", "$type": "80" } } + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s array(2) { ["foo"]=> string(3) "yes" @@ -426,6 +514,10 @@ array(2) { } { "foo": "yes", "__pclass" : { "$binary": "T3VyQ2xhc3M=", "$type": "80" } } + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s array(2) { ["foo"]=> string(3) "yes" @@ -442,6 +534,10 @@ array(2) { === OBJECTS AS STDCLASS === { "foo": "yes", "__pclass" : { "$binary": "TXlDbGFzcw==", "$type": "80" } } + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (2) { ["foo"]=> string(3) "yes" @@ -455,6 +551,10 @@ object(stdClass)#%d (2) { } { "foo": "yes", "__pclass" : { "$binary": "T3VyQ2xhc3M=", "$type": "80" } } + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (2) { ["foo"]=> string(3) "yes" diff --git a/tests/bson/bson-toPHP-004.phpt b/tests/bson/bson-toPHP-004.phpt index 18f7f1e1c..1bf4f1b81 100644 --- a/tests/bson/bson-toPHP-004.phpt +++ b/tests/bson/bson-toPHP-004.phpt @@ -34,20 +34,20 @@ $tests = [ foreach ($tests as $value) { printf("Testing %s visitor function\n", is_object($value) ? get_class($value) : gettype($value)); - $bson = fromPHP(['x' => [$value]]); + $bson = MongoDB\BSON\fromPHP(['x' => [$value]]); // Alter the key of the BSON array's first element $bson[12] = '1'; - var_dump(toPHP($bson)); + var_dump(MongoDB\BSON\toPHP($bson)); /* Note that numeric indexes within the HashTable are not accessible without * casting the object to an array. This is because the entries are only * stored with numeric indexes and do not also have string equivalents, as * might be created with zend_symtable_update(). This behavior is not unique * to the driver, as `(object) ['foo']` would demonstrate the same issue. */ - var_dump(toPHP($bson, ['array' => 'object'])); + var_dump(MongoDB\BSON\toPHP($bson, ['array' => 'object'])); - var_dump(toPHP($bson, ['array' => 'MyArrayObject'])); + var_dump(MongoDB\BSON\toPHP($bson, ['array' => 'MyArrayObject'])); echo "\n"; } @@ -57,6 +57,10 @@ foreach ($tests as $value) { --EXPECTF-- Testing NULL visitor function + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (1) { ["x"]=> array(1) { @@ -64,6 +68,8 @@ object(stdClass)#%d (1) { NULL } } + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (1) { ["x"]=> object(stdClass)#%d (1) { @@ -71,6 +77,8 @@ object(stdClass)#%d (1) { NULL } } + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (1) { ["x"]=> object(MyArrayObject)#%d (1) { @@ -83,6 +91,10 @@ object(stdClass)#%d (1) { } Testing boolean visitor function + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (1) { ["x"]=> array(1) { @@ -90,6 +102,8 @@ object(stdClass)#%d (1) { bool(true) } } + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (1) { ["x"]=> object(stdClass)#%d (1) { @@ -97,6 +111,8 @@ object(stdClass)#%d (1) { bool(true) } } + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (1) { ["x"]=> object(MyArrayObject)#%d (1) { @@ -109,6 +125,10 @@ object(stdClass)#%d (1) { } Testing integer visitor function + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (1) { ["x"]=> array(1) { @@ -116,6 +136,8 @@ object(stdClass)#%d (1) { int(1) } } + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (1) { ["x"]=> object(stdClass)#%d (1) { @@ -123,6 +145,8 @@ object(stdClass)#%d (1) { int(1) } } + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (1) { ["x"]=> object(MyArrayObject)#%d (1) { @@ -135,6 +159,10 @@ object(stdClass)#%d (1) { } Testing double visitor function + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (1) { ["x"]=> array(1) { @@ -142,6 +170,8 @@ object(stdClass)#%d (1) { float(4.125) } } + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (1) { ["x"]=> object(stdClass)#%d (1) { @@ -149,6 +179,8 @@ object(stdClass)#%d (1) { float(4.125) } } + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (1) { ["x"]=> object(MyArrayObject)#%d (1) { @@ -161,6 +193,10 @@ object(stdClass)#%d (1) { } Testing string visitor function + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (1) { ["x"]=> array(1) { @@ -168,6 +204,8 @@ object(stdClass)#%d (1) { string(3) "foo" } } + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (1) { ["x"]=> object(stdClass)#%d (1) { @@ -175,6 +213,8 @@ object(stdClass)#%d (1) { string(3) "foo" } } + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (1) { ["x"]=> object(MyArrayObject)#%d (1) { @@ -187,6 +227,10 @@ object(stdClass)#%d (1) { } Testing array visitor function + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (1) { ["x"]=> array(1) { @@ -195,6 +239,8 @@ object(stdClass)#%d (1) { } } } + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (1) { ["x"]=> object(stdClass)#%d (1) { @@ -203,6 +249,8 @@ object(stdClass)#%d (1) { } } } + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (1) { ["x"]=> object(MyArrayObject)#%d (1) { @@ -219,6 +267,10 @@ object(stdClass)#%d (1) { } Testing stdClass visitor function + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (1) { ["x"]=> array(1) { @@ -227,6 +279,8 @@ object(stdClass)#%d (1) { } } } + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (1) { ["x"]=> object(stdClass)#%d (1) { @@ -235,6 +289,8 @@ object(stdClass)#%d (1) { } } } + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (1) { ["x"]=> object(MyArrayObject)#%d (1) { @@ -248,6 +304,10 @@ object(stdClass)#%d (1) { } Testing MongoDB\BSON\Binary visitor function + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (1) { ["x"]=> array(1) { @@ -260,6 +320,8 @@ object(stdClass)#%d (1) { } } } + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (1) { ["x"]=> object(stdClass)#%d (1) { @@ -272,6 +334,8 @@ object(stdClass)#%d (1) { } } } + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (1) { ["x"]=> object(MyArrayObject)#%d (1) { @@ -289,6 +353,10 @@ object(stdClass)#%d (1) { } Testing MongoDB\BSON\Decimal128 visitor function + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (1) { ["x"]=> array(1) { @@ -299,6 +367,8 @@ object(stdClass)#%d (1) { } } } + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (1) { ["x"]=> object(stdClass)#%d (1) { @@ -309,6 +379,8 @@ object(stdClass)#%d (1) { } } } + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (1) { ["x"]=> object(MyArrayObject)#%d (1) { @@ -324,6 +396,10 @@ object(stdClass)#%d (1) { } Testing MongoDB\BSON\Javascript visitor function + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (1) { ["x"]=> array(1) { @@ -336,6 +412,8 @@ object(stdClass)#%d (1) { } } } + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (1) { ["x"]=> object(stdClass)#%d (1) { @@ -348,6 +426,8 @@ object(stdClass)#%d (1) { } } } + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (1) { ["x"]=> object(MyArrayObject)#%d (1) { @@ -365,6 +445,10 @@ object(stdClass)#%d (1) { } Testing MongoDB\BSON\MaxKey visitor function + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (1) { ["x"]=> array(1) { @@ -373,6 +457,8 @@ object(stdClass)#%d (1) { } } } + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (1) { ["x"]=> object(stdClass)#%d (1) { @@ -381,6 +467,8 @@ object(stdClass)#%d (1) { } } } + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (1) { ["x"]=> object(MyArrayObject)#%d (1) { @@ -394,6 +482,10 @@ object(stdClass)#%d (1) { } Testing MongoDB\BSON\MinKey visitor function + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (1) { ["x"]=> array(1) { @@ -402,6 +494,8 @@ object(stdClass)#%d (1) { } } } + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (1) { ["x"]=> object(stdClass)#%d (1) { @@ -410,6 +504,8 @@ object(stdClass)#%d (1) { } } } + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (1) { ["x"]=> object(MyArrayObject)#%d (1) { @@ -423,6 +519,10 @@ object(stdClass)#%d (1) { } Testing MongoDB\BSON\ObjectId visitor function + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (1) { ["x"]=> array(1) { @@ -433,6 +533,8 @@ object(stdClass)#%d (1) { } } } + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (1) { ["x"]=> object(stdClass)#%d (1) { @@ -443,6 +545,8 @@ object(stdClass)#%d (1) { } } } + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (1) { ["x"]=> object(MyArrayObject)#%d (1) { @@ -458,6 +562,10 @@ object(stdClass)#%d (1) { } Testing MongoDB\BSON\Regex visitor function + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (1) { ["x"]=> array(1) { @@ -470,6 +578,8 @@ object(stdClass)#%d (1) { } } } + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (1) { ["x"]=> object(stdClass)#%d (1) { @@ -482,6 +592,8 @@ object(stdClass)#%d (1) { } } } + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (1) { ["x"]=> object(MyArrayObject)#%d (1) { @@ -499,6 +611,10 @@ object(stdClass)#%d (1) { } Testing MongoDB\BSON\Timestamp visitor function + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (1) { ["x"]=> array(1) { @@ -511,6 +627,8 @@ object(stdClass)#%d (1) { } } } + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (1) { ["x"]=> object(stdClass)#%d (1) { @@ -523,6 +641,8 @@ object(stdClass)#%d (1) { } } } + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (1) { ["x"]=> object(MyArrayObject)#%d (1) { @@ -540,6 +660,10 @@ object(stdClass)#%d (1) { } Testing MongoDB\BSON\UTCDateTime visitor function + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (1) { ["x"]=> array(1) { @@ -550,6 +674,8 @@ object(stdClass)#%d (1) { } } } + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (1) { ["x"]=> object(stdClass)#%d (1) { @@ -560,6 +686,8 @@ object(stdClass)#%d (1) { } } } + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (1) { ["x"]=> object(MyArrayObject)#%d (1) { diff --git a/tests/bson/bson-toPHP-006.phpt b/tests/bson/bson-toPHP-006.phpt index 2d93116f5..908a6a64c 100644 --- a/tests/bson/bson-toPHP-006.phpt +++ b/tests/bson/bson-toPHP-006.phpt @@ -16,13 +16,14 @@ $tests = [ ]; foreach ($tests as $bson) { - var_dump(toPHP($bson)); + var_dump(MongoDB\BSON\toPHP($bson)); } ?> ===DONE=== --EXPECTF-- +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (%d) { ["foo"]=> object(MongoDB\BSON\Binary)#%d (%d) { @@ -32,6 +33,8 @@ object(stdClass)#%d (%d) { int(3) } } + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (%d) { ["foo"]=> object(MongoDB\BSON\Binary)#%d (%d) { @@ -41,6 +44,8 @@ object(stdClass)#%d (%d) { int(3) } } + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (%d) { ["foo"]=> object(MongoDB\BSON\Binary)#%d (%d) { @@ -50,6 +55,8 @@ object(stdClass)#%d (%d) { int(4) } } + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (%d) { ["foo"]=> object(MongoDB\BSON\Binary)#%d (%d) { diff --git a/tests/bson/bson-toPHP-007.phpt b/tests/bson/bson-toPHP-007.phpt deleted file mode 100644 index 6124119be..000000000 --- a/tests/bson/bson-toPHP-007.phpt +++ /dev/null @@ -1,120 +0,0 @@ ---TEST-- -MongoDB\BSON\toPHP(): fieldPath typemaps without server ---FILE-- - 1, - 'object' => [ - 'parent1' => [ - 'child1' => [ 1, 2, 3 ], - 'child2' => [ 4, 5, 6 ], - ], - 'parent2' => [ - 'child1' => [ 7, 8, 9 ], - 'child2' => [ 10, 11, 12 ], - ], - ], -] ); - -function fetch($bson, $typeMap = []) -{ - for ($i = 0; $i < 25000; $i++) { - $documents = [ \MongoDB\BSON\toPHP($bson, $typeMap) ]; - } - return $documents; -} - - -echo "\nSetting 'object.$.child1' path to 'MyWildCardArrayObject'\n"; -$documents = fetch($bson, ["fieldPaths" => [ - 'object.$.child1' => "MyWildCardArrayObject" -]]); -var_dump($documents[0]->object->parent1 instanceof stdClass); -var_dump($documents[0]->object->parent1->child1 instanceof MyWildCardArrayObject); -var_dump(is_array($documents[0]->object->parent1->child2)); -var_dump($documents[0]->object->parent2 instanceof stdClass); -var_dump($documents[0]->object->parent2->child1 instanceof MyWildCardArrayObject); -var_dump(is_array($documents[0]->object->parent2->child2)); - -echo "\nSetting 'object.parent1.$' path to 'MyWildCardArrayObject' and 'object.parent2.child1' to 'MyArrayObject'\n"; -$documents = fetch($bson, ["fieldPaths" => [ - 'object.parent1.$' => "MyWildCardArrayObject", - 'object.parent2.child1' => "MyArrayObject", -]]); -var_dump($documents[0]->object->parent1 instanceof stdClass); -var_dump($documents[0]->object->parent1->child1 instanceof MyWildCardArrayObject); -var_dump($documents[0]->object->parent1->child2 instanceof MyWildCardArrayObject); -var_dump($documents[0]->object->parent2 instanceof stdClass); -var_dump($documents[0]->object->parent2->child1 instanceof MyArrayObject); -var_dump(is_array($documents[0]->object->parent2->child2)); - -echo "\nSetting 'object.parent1.$' path to 'MyWildCardArrayObject' and 'object.$.$' to 'MyArrayObject'\n"; -$documents = fetch($bson, ["fieldPaths" => [ - 'object.parent1.$' => "MyWildCardArrayObject", - 'object.$.$' => "MyArrayObject", -]]); -var_dump($documents[0]->object->parent1 instanceof stdClass); -var_dump($documents[0]->object->parent1->child1 instanceof MyWildCardArrayObject); -var_dump($documents[0]->object->parent1->child2 instanceof MyWildCardArrayObject); -var_dump($documents[0]->object->parent2 instanceof stdClass); -var_dump($documents[0]->object->parent2->child1 instanceof MyArrayObject); -var_dump($documents[0]->object->parent2->child2 instanceof MyArrayObject); - -echo "\nSetting 'object.parent1.$' path to 'MyWildCardArrayObject' and 'object.$.child2' to 'MyArrayObject'\n"; -$documents = fetch($bson, ["fieldPaths" => [ - 'object.parent1.child1' => "MyWildCardArrayObject", - 'object.$.child2' => "MyArrayObject", -]]); -var_dump($documents[0]->object->parent1 instanceof stdClass); -var_dump($documents[0]->object->parent1->child1 instanceof MyWildCardArrayObject); -var_dump($documents[0]->object->parent1->child2 instanceof MyArrayObject); -var_dump($documents[0]->object->parent2 instanceof stdClass); -var_dump(is_array($documents[0]->object->parent2->child1)); -var_dump($documents[0]->object->parent2->child2 instanceof MyArrayObject); -?> -===DONE=== - ---EXPECT-- -Setting 'object.$.child1' path to 'MyWildCardArrayObject' -bool(true) -bool(true) -bool(true) -bool(true) -bool(true) -bool(true) - -Setting 'object.parent1.$' path to 'MyWildCardArrayObject' and 'object.parent2.child1' to 'MyArrayObject' -bool(true) -bool(true) -bool(true) -bool(true) -bool(true) -bool(true) - -Setting 'object.parent1.$' path to 'MyWildCardArrayObject' and 'object.$.$' to 'MyArrayObject' -bool(true) -bool(true) -bool(true) -bool(true) -bool(true) -bool(true) - -Setting 'object.parent1.$' path to 'MyWildCardArrayObject' and 'object.$.child2' to 'MyArrayObject' -bool(true) -bool(true) -bool(true) -bool(true) -bool(true) -bool(true) -===DONE=== diff --git a/tests/bson/bson-toPHP-008.phpt b/tests/bson/bson-toPHP-008.phpt index 48201b03f..1a4479bf4 100644 --- a/tests/bson/bson-toPHP-008.phpt +++ b/tests/bson/bson-toPHP-008.phpt @@ -49,18 +49,25 @@ var_dump($document->object instanceof MyArrayObject); ?> ===DONE=== ---EXPECT-- +--EXPECTF-- +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s Default + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s bool(true) bool(true) bool(true) Setting 'object' path to 'MyArrayObject' + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s bool(true) bool(true) bool(true) Setting 'object' and 'array' path to 'MyArrayObject' + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s bool(true) bool(true) bool(true) diff --git a/tests/bson/bson-toPHP-009.phpt b/tests/bson/bson-toPHP-009.phpt index 8c08f056c..0166ad021 100644 --- a/tests/bson/bson-toPHP-009.phpt +++ b/tests/bson/bson-toPHP-009.phpt @@ -61,25 +61,34 @@ var_dump(is_array($a[2])); ?> ===DONE=== ---EXPECT-- +--EXPECTF-- +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s Default + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s bool(true) bool(true) bool(true) bool(true) Setting 'array0' path to 'MyArrayObject' + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s bool(true) bool(true) bool(true) Setting 'array0.1' path to 'MyArrayObject' + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s bool(true) bool(true) bool(true) bool(true) Setting 'array1.1' path to 'MyArrayObject' + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s bool(true) bool(true) bool(true) diff --git a/tests/bson/bson-toPHP-010.phpt b/tests/bson/bson-toPHP-010.phpt index 5772f9418..fe360a237 100644 --- a/tests/bson/bson-toPHP-010.phpt +++ b/tests/bson/bson-toPHP-010.phpt @@ -93,38 +93,52 @@ var_dump($document->object->two instanceof MyWildcardArrayObject); ?> ===DONE=== ---EXPECT-- +--EXPECTF-- +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + Setting 'array.$' path to 'MyWildcardArrayObject' + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s bool(true) bool(true) bool(true) bool(true) Setting 'array.1' to 'MyArrayObject' and 'array.$' path to 'MyWildcardArrayObject' + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s bool(true) bool(true) bool(true) bool(true) Setting 'array.$' to 'MyWildcardArrayObject' and 'array.1' path to 'MyArrayObject' + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s bool(true) bool(true) bool(true) bool(true) Setting 'object.$' path to 'MyWildcardArrayObject' + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s bool(true) bool(true) bool(true) bool(true) Setting 'object.two' to 'MyArrayObject' and 'object.$' path to 'MyWildcardArrayObject' + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s bool(true) bool(true) bool(true) bool(true) Setting 'object.$' to 'MyWildcardArrayObject' and 'object.one' path to 'MyArrayObject' + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s bool(true) bool(true) bool(true) diff --git a/tests/bson/bson-toPHP-011.phpt b/tests/bson/bson-toPHP-011.phpt index 7ca35a26f..dc1e4655c 100644 --- a/tests/bson/bson-toPHP-011.phpt +++ b/tests/bson/bson-toPHP-011.phpt @@ -95,8 +95,12 @@ var_dump($document->object->parent2->child2 instanceof MyWildcardArrayObject); ?> ===DONE=== ---EXPECT-- +--EXPECTF-- +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + Setting 'object.$.child1' path to 'MyWildcardArrayObject' + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s bool(true) bool(true) bool(true) @@ -105,6 +109,8 @@ bool(true) bool(true) Setting 'object.parent1.$' path to 'MyWildcardArrayObject' and 'object.parent2.child1' to 'MyArrayObject' + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s bool(true) bool(true) bool(true) @@ -113,6 +119,8 @@ bool(true) bool(true) Setting 'object.parent1.$' path to 'MyWildcardArrayObject' and 'object.$.$' to 'MyArrayObject' + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s bool(true) bool(true) bool(true) @@ -121,6 +129,8 @@ bool(true) bool(true) Setting 'object.parent1.$' path to 'MyWildcardArrayObject' and 'object.$.child2' to 'MyArrayObject' + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s bool(true) bool(true) bool(true) @@ -129,6 +139,8 @@ bool(true) bool(true) Setting 'object.parent1.child2 path to 'MyArrayObject' and 'object.$.$' to 'MyWildcardArrayObject' + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s bool(true) bool(true) bool(true) diff --git a/tests/bson/bson-toPHP-012.phpt b/tests/bson/bson-toPHP-012.phpt index 5f6e178e3..ae04f1826 100644 --- a/tests/bson/bson-toPHP-012.phpt +++ b/tests/bson/bson-toPHP-012.phpt @@ -7,12 +7,15 @@ require_once __DIR__ . '/../utils/basic.inc'; /* Note: this is a regression test. It is not advisable to use duplicate keys in * BSON documents. */ -var_dump(toPHP(fromJSON('{ "foo": "bar", "foo": "baz" }'))); +var_dump(MongoDB\BSON\toPHP(MongoDB\BSON\fromJSON('{ "foo": "bar", "foo": "baz" }'))); ?> ===DONE=== --EXPECTF-- +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (%d) { ["foo"]=> string(3) "baz" diff --git a/tests/bson/bson-toPHP-013.phpt b/tests/bson/bson-toPHP-013.phpt index 617895e6e..b1992279b 100644 --- a/tests/bson/bson-toPHP-013.phpt +++ b/tests/bson/bson-toPHP-013.phpt @@ -20,13 +20,16 @@ $classes = [ ]; foreach ($classes as $class) { - var_dump(toPHP(fromJSON(sprintf('{"x": {"__pclass": {"$binary": "%s", "$type": "80"}, "y": 1}}', base64_encode($class))))); + var_dump(MongoDB\BSON\toPHP(MongoDB\BSON\fromJSON(sprintf('{"x": {"__pclass": {"$binary": "%s", "$type": "80"}, "y": 1}}', base64_encode($class))))); } ?> ===DONE=== --EXPECTF-- +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (%d) { ["x"]=> object(stdClass)#%d (%d) { @@ -41,6 +44,10 @@ object(stdClass)#%d (%d) { int(1) } } + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (%d) { ["x"]=> object(stdClass)#%d (%d) { @@ -55,6 +62,10 @@ object(stdClass)#%d (%d) { int(1) } } + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (%d) { ["x"]=> object(stdClass)#%d (%d) { @@ -69,6 +80,10 @@ object(stdClass)#%d (%d) { int(1) } } + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (%d) { ["x"]=> object(stdClass)#%d (%d) { @@ -83,6 +98,10 @@ object(stdClass)#%d (%d) { int(1) } } + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (%d) { ["x"]=> object(stdClass)#%d (%d) { diff --git a/tests/bson/bson-toPHP-014.phpt b/tests/bson/bson-toPHP-014.phpt index b1a20a534..7b18987e7 100644 --- a/tests/bson/bson-toPHP-014.phpt +++ b/tests/bson/bson-toPHP-014.phpt @@ -21,14 +21,17 @@ enum MyBackedEnum: int /* Note: the following BSON data corresponds to what might be produced by enums * implementing Persistable. Although that is now prohibited in the driver, it * could have been produced by an earlier version. */ -var_dump(toPHP(fromJSON(sprintf('{"x": {"__pclass": {"$binary": "%s", "$type": "80"}, "name": "A"}}', base64_encode(MyEnum::class))))); +var_dump(MongoDB\BSON\toPHP(MongoDB\BSON\fromJSON(sprintf('{"x": {"__pclass": {"$binary": "%s", "$type": "80"}, "name": "A"}}', base64_encode(MyEnum::class))))); -var_dump(toPHP(fromJSON(sprintf('{"x": {"__pclass": {"$binary": "%s", "$type": "80"}, "name": "A", "value": 1}}', base64_encode(MyBackedEnum::class))))); +var_dump(MongoDB\BSON\toPHP(MongoDB\BSON\fromJSON(sprintf('{"x": {"__pclass": {"$binary": "%s", "$type": "80"}, "name": "A", "value": 1}}', base64_encode(MyBackedEnum::class))))); ?> ===DONE=== --EXPECTF-- +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (%d) { ["x"]=> object(stdClass)#%d (%d) { @@ -43,6 +46,10 @@ object(stdClass)#%d (%d) { string(1) "A" } } + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (%d) { ["x"]=> object(stdClass)#%d (%d) { diff --git a/tests/bson/bson-toPHP-015.phpt b/tests/bson/bson-toPHP-015.phpt index b6dac4a07..22c851b37 100644 --- a/tests/bson/bson-toPHP-015.phpt +++ b/tests/bson/bson-toPHP-015.phpt @@ -80,8 +80,8 @@ $tests = [ foreach ($tests as $test => [$document, $typeMap]) { echo "Test ", $test, "\n"; - $bson = fromPHP($document); - var_dump(toPHP($bson, $typeMap)); + $bson = MongoDB\BSON\fromPHP($document); + var_dump(MongoDB\BSON\toPHP($bson, $typeMap)); } ?> @@ -89,6 +89,10 @@ foreach ($tests as $test => [$document, $typeMap]) { --EXPECTF-- Test root document as object + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (%d) { ["__pclass"]=> object(MongoDB\BSON\Binary)#%d (%d) { @@ -113,6 +117,10 @@ object(stdClass)#%d (%d) { } } Test root document as array + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s array(3) { ["__pclass"]=> object(MongoDB\BSON\Binary)#%d (%d) { @@ -137,6 +145,10 @@ array(3) { } } Test root document as bson + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(MongoDB\BSON\Document)#%d (%d) { ["data"]=> string(116) "VQAAAAVfX3BjbGFzcwAKAAAAgE15RG9jdW1lbnQEbGlzdAAaAAAAEDAAAQAAABAxAAIAAAAQMgADAAAAAANtYXAAEgAAAAJmb28ABAAAAGJhcgAAAA==" @@ -172,6 +184,10 @@ object(MongoDB\BSON\Document)#%d (%d) { } } Test embedded document as object + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (%d) { ["embedded"]=> object(stdClass)#%d (%d) { @@ -199,6 +215,10 @@ object(stdClass)#%d (%d) { } } Test embedded document as array + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (%d) { ["embedded"]=> array(3) { @@ -226,6 +246,10 @@ object(stdClass)#%d (%d) { } } Test embedded document as bson + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (%d) { ["embedded"]=> object(MongoDB\BSON\Document)#%d (%d) { @@ -264,6 +288,10 @@ object(stdClass)#%d (%d) { } } Test fieldPath document as object + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (%d) { ["embedded"]=> object(stdClass)#%d (%d) { @@ -291,6 +319,10 @@ object(stdClass)#%d (%d) { } } Test fieldPath document as array + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (%d) { ["embedded"]=> array(3) { @@ -318,6 +350,10 @@ object(stdClass)#%d (%d) { } } Test fieldPath document as bson + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (%d) { ["embedded"]=> object(MongoDB\BSON\Document)#%d (%d) { diff --git a/tests/bson/bson-toPHP-016.phpt b/tests/bson/bson-toPHP-016.phpt index aab00d889..efa3fbdd3 100644 --- a/tests/bson/bson-toPHP-016.phpt +++ b/tests/bson/bson-toPHP-016.phpt @@ -5,7 +5,7 @@ MongoDB\BSON\toPHP(): Decoding with raw BSON type require_once __DIR__ . "/../utils/basic.inc"; -$bson = fromPHP([ +$bson = MongoDB\BSON\fromPHP([ '_id' => 1, 'object' => [ 'parent1' => [ @@ -29,13 +29,17 @@ $tests = [ foreach ($tests as $name => $typeMap) { echo "\n" . $name . "\n"; - var_dump(toPHP($bson, $typeMap)); + var_dump(MongoDB\BSON\toPHP($bson, $typeMap)); } ?> ===DONE=== --EXPECTF-- +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + Root as BSON + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(MongoDB\BSON\Document)#%d (%d) { ["data"]=> string(256) "%a" @@ -127,6 +131,8 @@ object(MongoDB\BSON\Document)#%d (%d) { } Arrays as BSON + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (%d) { ["_id"]=> int(1) @@ -198,6 +204,8 @@ object(stdClass)#%d (%d) { } Documents as BSON + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (%d) { ["_id"]=> int(1) @@ -284,6 +292,8 @@ object(stdClass)#%d (%d) { } Field path as BSON + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (%d) { ["_id"]=> int(1) @@ -355,6 +365,8 @@ object(stdClass)#%d (%d) { } Non-complex field ignores BSON typemap element + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (%d) { ["_id"]=> int(1) diff --git a/tests/bson/bson-toPHP-017.phpt b/tests/bson/bson-toPHP-017.phpt index 45b650622..5c8d6f72b 100644 --- a/tests/bson/bson-toPHP-017.phpt +++ b/tests/bson/bson-toPHP-017.phpt @@ -15,6 +15,9 @@ var_dump(MongoDB\BSON\toPHP($bson)); ===DONE=== --EXPECTF-- +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (%d) { ["int32"]=> int(123) diff --git a/tests/bson/bson-toPHP_error-001.phpt b/tests/bson/bson-toPHP_error-001.phpt index e7792f04e..0049d4ed0 100644 --- a/tests/bson/bson-toPHP_error-001.phpt +++ b/tests/bson/bson-toPHP_error-001.phpt @@ -31,7 +31,7 @@ foreach ($classes as $class) { printf("Test typeMap: %s\n", json_encode($typeMap)); echo throws(function() use ($typeMap) { - toPHP(fromJSON('{}'), $typeMap); + MongoDB\BSON\toPHP(MongoDB\BSON\fromJSON('{}'), $typeMap); }, MongoDB\Driver\Exception\InvalidArgumentException::class), "\n\n"; } } @@ -39,84 +39,164 @@ foreach ($classes as $class) { ?> ===DONE=== ---EXPECT-- +--EXPECTF-- Test typeMap: {"array":"MissingClass"} + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\InvalidArgumentException Class MissingClass does not exist Test typeMap: {"document":"MissingClass"} + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\InvalidArgumentException Class MissingClass does not exist Test typeMap: {"root":"MissingClass"} + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\InvalidArgumentException Class MissingClass does not exist Test typeMap: {"fieldPaths":{"x":"MissingClass"}} + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\InvalidArgumentException Class MissingClass does not exist Test typeMap: {"array":"MyAbstractDocument"} + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\InvalidArgumentException Class MyAbstractDocument is not instantiatable Test typeMap: {"document":"MyAbstractDocument"} + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\InvalidArgumentException Class MyAbstractDocument is not instantiatable Test typeMap: {"root":"MyAbstractDocument"} + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\InvalidArgumentException Class MyAbstractDocument is not instantiatable Test typeMap: {"fieldPaths":{"x":"MyAbstractDocument"}} + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\InvalidArgumentException Class MyAbstractDocument is not instantiatable Test typeMap: {"array":"MyDocument"} + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\InvalidArgumentException Class MyDocument does not implement MongoDB\BSON\Unserializable Test typeMap: {"document":"MyDocument"} + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\InvalidArgumentException Class MyDocument does not implement MongoDB\BSON\Unserializable Test typeMap: {"root":"MyDocument"} + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\InvalidArgumentException Class MyDocument does not implement MongoDB\BSON\Unserializable Test typeMap: {"fieldPaths":{"x":"MyDocument"}} + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\InvalidArgumentException Class MyDocument does not implement MongoDB\BSON\Unserializable Test typeMap: {"array":"MyTrait"} + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\InvalidArgumentException Trait MyTrait is not instantiatable Test typeMap: {"document":"MyTrait"} + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\InvalidArgumentException Trait MyTrait is not instantiatable Test typeMap: {"root":"MyTrait"} + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\InvalidArgumentException Trait MyTrait is not instantiatable Test typeMap: {"fieldPaths":{"x":"MyTrait"}} + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\InvalidArgumentException Trait MyTrait is not instantiatable Test typeMap: {"array":"MongoDB\\BSON\\Unserializable"} + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\InvalidArgumentException Interface MongoDB\BSON\Unserializable is not instantiatable Test typeMap: {"document":"MongoDB\\BSON\\Unserializable"} + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\InvalidArgumentException Interface MongoDB\BSON\Unserializable is not instantiatable Test typeMap: {"root":"MongoDB\\BSON\\Unserializable"} + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\InvalidArgumentException Interface MongoDB\BSON\Unserializable is not instantiatable Test typeMap: {"fieldPaths":{"x":"MongoDB\\BSON\\Unserializable"}} + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\InvalidArgumentException Interface MongoDB\BSON\Unserializable is not instantiatable diff --git a/tests/bson/bson-toPHP_error-002.phpt b/tests/bson/bson-toPHP_error-002.phpt index 36f9bda28..675584ba6 100644 --- a/tests/bson/bson-toPHP_error-002.phpt +++ b/tests/bson/bson-toPHP_error-002.phpt @@ -9,12 +9,12 @@ require_once __DIR__ . '/../utils/basic.inc'; * bson_reader_read() already checks that the buffer is at least 5 bytes. */ $invalidBson = array( '', - str_repeat(fromJSON('{"x": "y"}'), 2), + str_repeat(MongoDB\BSON\fromJSON('{"x": "y"}'), 2), ); foreach ($invalidBson as $bson) { try { - var_dump(toPHP($bson)); + var_dump(MongoDB\BSON\toPHP($bson)); } catch (MongoDB\Driver\Exception\UnexpectedValueException $e) { echo $e->getMessage(), "\n"; } @@ -23,7 +23,12 @@ foreach ($invalidBson as $bson) { ?> ===DONE=== ---EXPECT-- +--EXPECTF-- +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s Could not read document from BSON reader + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s Reading document did not exhaust input buffer ===DONE=== diff --git a/tests/bson/bson-toPHP_error-003.phpt b/tests/bson/bson-toPHP_error-003.phpt index abc025d04..1ea084322 100644 --- a/tests/bson/bson-toPHP_error-003.phpt +++ b/tests/bson/bson-toPHP_error-003.phpt @@ -12,7 +12,7 @@ $tests = array( foreach ($tests as $bson) { echo throws(function() use ($bson) { - toPHP($bson); + MongoDB\BSON\toPHP($bson); }, 'MongoDB\Driver\Exception\UnexpectedValueException'), "\n"; } @@ -20,8 +20,11 @@ foreach ($tests as $bson) { ===DONE=== --EXPECTF-- +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException Could not read document from BSON reader + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException Could not read document from BSON reader ===DONE=== diff --git a/tests/bson/bson-toPHP_error-004.phpt b/tests/bson/bson-toPHP_error-004.phpt index af5143dbb..f6fa07f8f 100644 --- a/tests/bson/bson-toPHP_error-004.phpt +++ b/tests/bson/bson-toPHP_error-004.phpt @@ -7,11 +7,11 @@ require_once __DIR__ . '/../utils/basic.inc'; $tests = array( // Invalid UTF-8 character in root document's field name - str_replace('INVALID!', "INVALID\xFE", fromPHP(['INVALID!' => 'bar'])), + str_replace('INVALID!', "INVALID\xFE", MongoDB\BSON\fromPHP(['INVALID!' => 'bar'])), // Invalid UTF-8 character in embedded document's field name - str_replace('INVALID!', "INVALID\xFE", fromPHP(['foo' => ['INVALID!' => 'bar']])), + str_replace('INVALID!', "INVALID\xFE", MongoDB\BSON\fromPHP(['foo' => ['INVALID!' => 'bar']])), // Invalid UTF-8 character in string within array field - str_replace('INVALID!', "INVALID\xFE", fromPHP(['foo' => ['INVALID!']])), + str_replace('INVALID!', "INVALID\xFE", MongoDB\BSON\fromPHP(['foo' => ['INVALID!']])), /* Note: we don't use a three-character string in the underflow case, as * the 4-byte string length and payload (i.e. three characters + null byte) * coincidentally satisfy the expected size for an 8-byte double. We also @@ -25,22 +25,37 @@ $tests = array( foreach ($tests as $bson) { echo throws(function() use ($bson) { - toPHP($bson); + MongoDB\BSON\toPHP($bson); }, 'MongoDB\Driver\Exception\UnexpectedValueException'), "\n"; } ?> ===DONE=== ---EXPECT-- +--EXPECTF-- +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException Detected corrupt BSON data for field path '' at offset 4 + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException Detected corrupt BSON data for field path 'foo' at offset 0 + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException Detected corrupt BSON data for field path 'foo' at offset 0 + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException Detected corrupt BSON data for field path '' at offset 9 + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException Detected unknown BSON type 0x65 for field path "". Are you using the latest driver? ===DONE=== diff --git a/tests/bson/bson-toPHP_error-005.phpt b/tests/bson/bson-toPHP_error-005.phpt index 217b6b87e..76c756c53 100644 --- a/tests/bson/bson-toPHP_error-005.phpt +++ b/tests/bson/bson-toPHP_error-005.phpt @@ -6,31 +6,50 @@ MongoDB\BSON\toPHP(): Field path values with bson_iter_visit_all() failures require_once __DIR__ . '/../utils/basic.inc'; $tests = array( - str_replace('INVALID!', "INVALID\xFE", fromPHP(['foo' => ['INVALID!' => 'bar'] ])), - str_replace('INVALID!', "INVALID\xFE", fromPHP(['foo' => ['bar' => ['INVALID!' => 'bar']]])), - str_replace('INVALID!', "INVALID\xFE", fromPHP(['foo' => ['bar' => ['INVALID!']]])), - str_replace('INVALID!', "INVALID\xFE", fromPHP(['foo' => [['INVALID!']]])), - str_replace('INVALID!', "INVALID\xFE", fromPHP(['foo' => [ ['bar' => ['INVALID!' => 'bar']], 6 ]])), + str_replace('INVALID!', "INVALID\xFE", MongoDB\BSON\fromPHP(['foo' => ['INVALID!' => 'bar'] ])), + str_replace('INVALID!', "INVALID\xFE", MongoDB\BSON\fromPHP(['foo' => ['bar' => ['INVALID!' => 'bar']]])), + str_replace('INVALID!', "INVALID\xFE", MongoDB\BSON\fromPHP(['foo' => ['bar' => ['INVALID!']]])), + str_replace('INVALID!', "INVALID\xFE", MongoDB\BSON\fromPHP(['foo' => [['INVALID!']]])), + str_replace('INVALID!', "INVALID\xFE", MongoDB\BSON\fromPHP(['foo' => [ ['bar' => ['INVALID!' => 'bar']], 6 ]])), ); foreach ($tests as $bson) { echo throws(function() use ($bson) { - toPHP($bson); + MongoDB\BSON\toPHP($bson); }, 'MongoDB\Driver\Exception\UnexpectedValueException'), "\n"; } ?> ===DONE=== ---EXPECT-- +--EXPECTF-- +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException Detected corrupt BSON data for field path 'foo' at offset 0 + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException Detected corrupt BSON data for field path 'foo.bar' at offset 0 + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException Detected corrupt BSON data for field path 'foo.bar' at offset 0 + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException Detected corrupt BSON data for field path 'foo.0' at offset 0 + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException Detected corrupt BSON data for field path 'foo.0.bar' at offset 0 ===DONE=== diff --git a/tests/bson/bson-toPHP_error-006.phpt b/tests/bson/bson-toPHP_error-006.phpt index 1ede90b97..866a638ba 100644 --- a/tests/bson/bson-toPHP_error-006.phpt +++ b/tests/bson/bson-toPHP_error-006.phpt @@ -5,17 +5,20 @@ MongoDB\BSON\toPHP(): BSON decoding exception with unknown BSON type require_once __DIR__ . '/../utils/basic.inc'; -$bson = fromPHP(["hello" => ["cruel" => "world"]]); +$bson = MongoDB\BSON\fromPHP(["hello" => ["cruel" => "world"]]); $bson[15] = chr(0x42); echo throws(function() use ($bson) { - toPHP($bson); + MongoDB\BSON\toPHP($bson); }, 'MongoDB\Driver\Exception\UnexpectedValueException'), "\n"; ?> ===DONE=== ---EXPECT-- +--EXPECTF-- +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException Detected unknown BSON type 0x42 for field path "hello.cruel". Are you using the latest driver? ===DONE=== diff --git a/tests/bson/bson-toPHP_error-007.phpt b/tests/bson/bson-toPHP_error-007.phpt index 9be7ee0f9..705cb2e1e 100644 --- a/tests/bson/bson-toPHP_error-007.phpt +++ b/tests/bson/bson-toPHP_error-007.phpt @@ -35,7 +35,7 @@ foreach ($classes as $class) { printf("Test typeMap: %s\n", json_encode($typeMap)); echo throws(function() use ($typeMap) { - toPHP(fromJSON('{}'), $typeMap); + MongoDB\BSON\toPHP(MongoDB\BSON\fromJSON('{}'), $typeMap); }, MongoDB\Driver\Exception\InvalidArgumentException::class), "\n\n"; } } @@ -43,36 +43,68 @@ foreach ($classes as $class) { ?> ===DONE=== ---EXPECT-- +--EXPECTF-- Test typeMap: {"array":"MyEnum"} + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\InvalidArgumentException Enum MyEnum is not instantiatable Test typeMap: {"document":"MyEnum"} + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\InvalidArgumentException Enum MyEnum is not instantiatable Test typeMap: {"root":"MyEnum"} + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\InvalidArgumentException Enum MyEnum is not instantiatable Test typeMap: {"fieldPaths":{"x":"MyEnum"}} + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\InvalidArgumentException Enum MyEnum is not instantiatable Test typeMap: {"array":"MyBackedEnum"} + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\InvalidArgumentException Enum MyBackedEnum is not instantiatable Test typeMap: {"document":"MyBackedEnum"} + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\InvalidArgumentException Enum MyBackedEnum is not instantiatable Test typeMap: {"root":"MyBackedEnum"} + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\InvalidArgumentException Enum MyBackedEnum is not instantiatable Test typeMap: {"fieldPaths":{"x":"MyBackedEnum"}} + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s OK: Got MongoDB\Driver\Exception\InvalidArgumentException Enum MyBackedEnum is not instantiatable diff --git a/tests/bson/bson-toRelaxedJSON-001.phpt b/tests/bson/bson-toRelaxedJSON-001.phpt index 955cd692e..9806fc598 100644 --- a/tests/bson/bson-toRelaxedJSON-001.phpt +++ b/tests/bson/bson-toRelaxedJSON-001.phpt @@ -20,23 +20,66 @@ $tests = [ ]; foreach ($tests as $value) { - $bson = fromPHP($value); - echo toRelaxedExtendedJSON($bson), "\n"; + $bson = MongoDB\BSON\fromPHP($value); + echo MongoDB\BSON\toRelaxedExtendedJSON($bson), "\n"; } ?> ===DONE=== ---EXPECT-- +--EXPECTF-- +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toRelaxedExtendedJSON() is deprecated in %s { } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toRelaxedExtendedJSON() is deprecated in %s { "null" : null } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toRelaxedExtendedJSON() is deprecated in %s { "boolean" : true } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toRelaxedExtendedJSON() is deprecated in %s { "string" : "foo" } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toRelaxedExtendedJSON() is deprecated in %s { "integer" : 123 } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toRelaxedExtendedJSON() is deprecated in %s { "double" : 1.0 } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toRelaxedExtendedJSON() is deprecated in %s { "nan" : { "$numberDouble" : "NaN" } } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toRelaxedExtendedJSON() is deprecated in %s { "pos_inf" : { "$numberDouble" : "Infinity" } } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toRelaxedExtendedJSON() is deprecated in %s { "neg_inf" : { "$numberDouble" : "-Infinity" } } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toRelaxedExtendedJSON() is deprecated in %s { "array" : [ "foo", "bar" ] } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toRelaxedExtendedJSON() is deprecated in %s { "document" : { "foo" : "bar" } } ===DONE=== diff --git a/tests/bson/bson-toRelaxedJSON-002.phpt b/tests/bson/bson-toRelaxedJSON-002.phpt index 6cb399da8..a324d1580 100644 --- a/tests/bson/bson-toRelaxedJSON-002.phpt +++ b/tests/bson/bson-toRelaxedJSON-002.phpt @@ -18,21 +18,56 @@ $tests = [ ]; foreach ($tests as $value) { - $bson = fromPHP($value); - echo toRelaxedExtendedJSON($bson), "\n"; + $bson = MongoDB\BSON\fromPHP($value); + echo MongoDB\BSON\toRelaxedExtendedJSON($bson), "\n"; } ?> ===DONE=== ---EXPECT-- +--EXPECTF-- +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toRelaxedExtendedJSON() is deprecated in %s { "_id" : { "$oid" : "56315a7c6118fd1b920270b1" } } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toRelaxedExtendedJSON() is deprecated in %s { "binary" : { "$binary" : { "base64" : "Zm9v", "subType" : "00" } } } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toRelaxedExtendedJSON() is deprecated in %s { "date" : { "$date" : "2015-10-28T00:00:00Z" } } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toRelaxedExtendedJSON() is deprecated in %s { "timestamp" : { "$timestamp" : { "t" : 5678, "i" : 1234 } } } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toRelaxedExtendedJSON() is deprecated in %s { "regex" : { "$regularExpression" : { "pattern" : "pattern", "options" : "i" } } } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toRelaxedExtendedJSON() is deprecated in %s { "code" : { "$code" : "function() { return 1; }" } } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toRelaxedExtendedJSON() is deprecated in %s { "code_ws" : { "$code" : "function() { return a; }", "$scope" : { "a" : 1 } } } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toRelaxedExtendedJSON() is deprecated in %s { "minkey" : { "$minKey" : 1 } } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toRelaxedExtendedJSON() is deprecated in %s { "maxkey" : { "$maxKey" : 1 } } ===DONE=== diff --git a/tests/bson/bson-toRelaxedJSON_error-001.phpt b/tests/bson/bson-toRelaxedJSON_error-001.phpt index 6541219f6..3472df766 100644 --- a/tests/bson/bson-toRelaxedJSON_error-001.phpt +++ b/tests/bson/bson-toRelaxedJSON_error-001.phpt @@ -9,21 +9,26 @@ require_once __DIR__ . '/../utils/basic.inc'; * bson_reader_read() already checks that the buffer is at least 5 bytes. */ $tests = [ '', - str_repeat(fromJSON('{"x": "y"}'), 2), + str_repeat(MongoDB\BSON\fromJSON('{"x": "y"}'), 2), ]; foreach ($tests as $bson) { echo throws(function() use ($bson) { - toRelaxedExtendedJSON($bson); + MongoDB\BSON\toRelaxedExtendedJSON($bson); }, 'MongoDB\Driver\Exception\UnexpectedValueException'), "\n"; } ?> ===DONE=== ---EXPECT-- +--EXPECTF-- +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toRelaxedExtendedJSON() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException Could not read document from BSON reader + +Deprecated: Function MongoDB\BSON\toRelaxedExtendedJSON() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException Reading document did not exhaust input buffer ===DONE=== diff --git a/tests/bson/bson-toRelaxedJSON_error-002.phpt b/tests/bson/bson-toRelaxedJSON_error-002.phpt index 010225092..8abcce3db 100644 --- a/tests/bson/bson-toRelaxedJSON_error-002.phpt +++ b/tests/bson/bson-toRelaxedJSON_error-002.phpt @@ -12,16 +12,19 @@ $tests = [ foreach ($tests as $bson) { echo throws(function() use ($bson) { - toRelaxedExtendedJSON($bson); + MongoDB\BSON\toRelaxedExtendedJSON($bson); }, 'MongoDB\Driver\Exception\UnexpectedValueException'), "\n"; } ?> ===DONE=== ---EXPECT-- +--EXPECTF-- +Deprecated: Function MongoDB\BSON\toRelaxedExtendedJSON() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException Could not read document from BSON reader + +Deprecated: Function MongoDB\BSON\toRelaxedExtendedJSON() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException Could not read document from BSON reader ===DONE=== diff --git a/tests/bson/bson-toRelaxedJSON_error-003.phpt b/tests/bson/bson-toRelaxedJSON_error-003.phpt index ebdf1210d..c428a9854 100644 --- a/tests/bson/bson-toRelaxedJSON_error-003.phpt +++ b/tests/bson/bson-toRelaxedJSON_error-003.phpt @@ -21,18 +21,23 @@ $tests = [ foreach ($tests as $bson) { echo throws(function() use ($bson) { - toRelaxedExtendedJSON($bson); + MongoDB\BSON\toRelaxedExtendedJSON($bson); }, 'MongoDB\Driver\Exception\UnexpectedValueException'), "\n"; } ?> ===DONE=== ---EXPECT-- +--EXPECTF-- +Deprecated: Function MongoDB\BSON\toRelaxedExtendedJSON() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException Could not convert BSON document to a JSON string + +Deprecated: Function MongoDB\BSON\toRelaxedExtendedJSON() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException Could not convert BSON document to a JSON string + +Deprecated: Function MongoDB\BSON\toRelaxedExtendedJSON() is deprecated in %s OK: Got MongoDB\Driver\Exception\UnexpectedValueException Could not convert BSON document to a JSON string ===DONE=== diff --git a/tests/bson/bson-undefined-001.phpt b/tests/bson/bson-undefined-001.phpt index 2d08b9985..b8677df3a 100644 --- a/tests/bson/bson-undefined-001.phpt +++ b/tests/bson/bson-undefined-001.phpt @@ -6,7 +6,7 @@ MongoDB\BSON\Undefined #001 require_once __DIR__ . '/../utils/basic.inc'; $tests = array( - MongoDB\BSON\toPHP(MongoDB\BSON\fromJSON('{ "undefined": {"$undefined": true} }')), + MongoDB\BSON\Document::fromJSON('{ "undefined": {"$undefined": true} }')->toPHP(), ); foreach($tests as $n => $test) { diff --git a/tests/bson/bson-undefined-clone-001.phpt b/tests/bson/bson-undefined-clone-001.phpt index 9dfa2a7f1..d902f8960 100644 --- a/tests/bson/bson-undefined-clone-001.phpt +++ b/tests/bson/bson-undefined-clone-001.phpt @@ -8,7 +8,7 @@ MongoDB\BSON\Undefined can be cloned (PHP < 8.2) require_once __DIR__ . '/../utils/basic.inc'; -$test = MongoDB\BSON\toPHP(MongoDB\BSON\fromJSON('{ "undefined": {"$undefined": true} }')); +$test = MongoDB\BSON\Document::fromJSON('{ "undefined": {"$undefined": true} }')->toPHP(); $undefined = $test->undefined; diff --git a/tests/bson/bson-undefined-clone-002.phpt b/tests/bson/bson-undefined-clone-002.phpt index a1fdb8572..132f46218 100644 --- a/tests/bson/bson-undefined-clone-002.phpt +++ b/tests/bson/bson-undefined-clone-002.phpt @@ -8,7 +8,7 @@ MongoDB\BSON\Undefined can be cloned (PHP >= 8.2) require_once __DIR__ . '/../utils/basic.inc'; -$test = MongoDB\BSON\toPHP(MongoDB\BSON\fromJSON('{ "undefined": {"$undefined": true} }')); +$test = MongoDB\BSON\Document::fromJSON('{ "undefined": {"$undefined": true} }')->toPHP(); $undefined = $test->undefined; diff --git a/tests/bson/bson-undefined-compare-001.phpt b/tests/bson/bson-undefined-compare-001.phpt index 2b2eeefd0..641cd7c01 100644 --- a/tests/bson/bson-undefined-compare-001.phpt +++ b/tests/bson/bson-undefined-compare-001.phpt @@ -3,9 +3,9 @@ MongoDB\BSON\Undefined comparisons --FILE-- MongoDB\BSON\toPHP(MongoDB\BSON\fromJSON('{ "undefined": {"$undefined": true} }'))); +var_dump(MongoDB\BSON\Document::fromJSON('{ "undefined": {"$undefined": true} }')->toPHP() == MongoDB\BSON\Document::fromJSON('{ "undefined": {"$undefined": true} }')->toPHP()); +var_dump(MongoDB\BSON\Document::fromJSON('{ "undefined": {"$undefined": true} }')->toPHP() < MongoDB\BSON\Document::fromJSON('{ "undefined": {"$undefined": true} }')->toPHP()); +var_dump(MongoDB\BSON\Document::fromJSON('{ "undefined": {"$undefined": true} }')->toPHP() > MongoDB\BSON\Document::fromJSON('{ "undefined": {"$undefined": true} }')->toPHP()); ?> ===DONE=== diff --git a/tests/bson/bson-undefined-jsonserialize-001.phpt b/tests/bson/bson-undefined-jsonserialize-001.phpt index 46906f5b0..6e0f6a63c 100644 --- a/tests/bson/bson-undefined-jsonserialize-001.phpt +++ b/tests/bson/bson-undefined-jsonserialize-001.phpt @@ -3,7 +3,7 @@ MongoDB\BSON\Undefined::jsonSerialize() return value --FILE-- undefined; +$undefined = MongoDB\BSON\Document::fromJSON('{ "undefined": {"$undefined": true} }')->toPHP()->undefined; var_dump($undefined->jsonSerialize()); ?> diff --git a/tests/bson/bson-undefined-jsonserialize-002.phpt b/tests/bson/bson-undefined-jsonserialize-002.phpt index 057874a0d..46f74faa4 100644 --- a/tests/bson/bson-undefined-jsonserialize-002.phpt +++ b/tests/bson/bson-undefined-jsonserialize-002.phpt @@ -5,7 +5,7 @@ MongoDB\BSON\Undefined::jsonSerialize() with json_encode() require_once __DIR__ . '/../utils/basic.inc'; -$doc = MongoDB\BSON\toPHP(MongoDB\BSON\fromJSON('{ "foo": {"$undefined": true} }')); +$doc = MongoDB\BSON\Document::fromJSON('{ "foo": {"$undefined": true} }')->toPHP(); $json = json_encode($doc); echo toJSON(fromPHP($doc)), "\n"; diff --git a/tests/bson/bson-undefined-serialization-002.phpt b/tests/bson/bson-undefined-serialization-002.phpt index 8804dfd2f..ea381a8db 100644 --- a/tests/bson/bson-undefined-serialization-002.phpt +++ b/tests/bson/bson-undefined-serialization-002.phpt @@ -3,7 +3,7 @@ MongoDB\BSON\Undefined serialization (__serialize and __unserialize) --FILE-- undefined); +var_dump($undefined = MongoDB\BSON\Document::fromJSON('{ "undefined": {"$undefined": true} }')->toPHP()->undefined); var_dump($s = serialize($undefined)); var_dump(unserialize($s)); diff --git a/tests/bson/bson-undefined-set_state-001.phpt b/tests/bson/bson-undefined-set_state-001.phpt index 5689293c5..f618e57a3 100644 --- a/tests/bson/bson-undefined-set_state-001.phpt +++ b/tests/bson/bson-undefined-set_state-001.phpt @@ -3,7 +3,7 @@ MongoDB\BSON\Undefined::__set_state() --FILE-- undefined; +$undefined = MongoDB\BSON\Document::fromJSON('{ "undefined": {"$undefined": true} }')->toPHP()->undefined; $s = var_export($undefined, true); echo $s, "\n"; diff --git a/tests/bson/bson-undefined-tostring-001.phpt b/tests/bson/bson-undefined-tostring-001.phpt index 483099347..ce0756119 100644 --- a/tests/bson/bson-undefined-tostring-001.phpt +++ b/tests/bson/bson-undefined-tostring-001.phpt @@ -3,7 +3,7 @@ MongoDB\BSON\Undefined::__toString() --FILE-- undefined; +$undefined = MongoDB\BSON\Document::fromJSON('{ "undefined": {"$undefined": true} }')->toPHP()->undefined; var_dump((string) $undefined); ?> diff --git a/tests/bson/bson-utcdatetime-001.phpt b/tests/bson/bson-utcdatetime-001.phpt index d285dd258..73bf8922e 100644 --- a/tests/bson/bson-utcdatetime-001.phpt +++ b/tests/bson/bson-utcdatetime-001.phpt @@ -38,12 +38,12 @@ foreach($tests as $n => $test) { ===DONE=== --EXPECT-- -Test#0 { "0" : { "$date" : 1416445411987 } } -string(37) "{ "0" : { "$date" : 1416445411987 } }" -string(37) "{ "0" : { "$date" : 1416445411987 } }" +Test#0 { "0" : { "$date" : { "$numberLong" : "1416445411987" } } } +string(59) "{ "0" : { "$date" : { "$numberLong" : "1416445411987" } } }" +string(59) "{ "0" : { "$date" : { "$numberLong" : "1416445411987" } } }" bool(true) -Test#1 { "0" : { "$date" : 1416445411987 } } -string(37) "{ "0" : { "$date" : 1416445411987 } }" -string(37) "{ "0" : { "$date" : 1416445411987 } }" +Test#1 { "0" : { "$date" : { "$numberLong" : "1416445411987" } } } +string(59) "{ "0" : { "$date" : { "$numberLong" : "1416445411987" } } }" +string(59) "{ "0" : { "$date" : { "$numberLong" : "1416445411987" } } }" bool(true) ===DONE=== diff --git a/tests/bson/bson-utcdatetime-jsonserialize-002.phpt b/tests/bson/bson-utcdatetime-jsonserialize-002.phpt index c11759369..8b918f01e 100644 --- a/tests/bson/bson-utcdatetime-jsonserialize-002.phpt +++ b/tests/bson/bson-utcdatetime-jsonserialize-002.phpt @@ -16,7 +16,7 @@ var_dump(toPHP(fromJSON($json))); ===DONE=== --EXPECTF-- -{ "foo" : { "$date" : 1476192866817 } } +{ "foo" : { "$date" : { "$numberLong" : "1476192866817" } } } {"foo":{"$date":{"$numberLong":"1476192866817"}}} object(stdClass)#%d (%d) { ["foo"]=> diff --git a/tests/bson/bson-utcdatetime-serialization_error-002.phpt b/tests/bson/bson-utcdatetime-serialization_error-002.phpt index 01dd45ced..ad59d46dd 100644 --- a/tests/bson/bson-utcdatetime-serialization_error-002.phpt +++ b/tests/bson/bson-utcdatetime-serialization_error-002.phpt @@ -9,7 +9,18 @@ echo throws(function() { unserialize('C:24:"MongoDB\BSON\UTCDateTime":42:{a:1:{s:12:"milliseconds";s:9:"1234.5678";}}'); }, 'MongoDB\Driver\Exception\InvalidArgumentException'), "\n"; -/* TODO: Add tests for out-of-range values once CDRIVER-1377 is resolved */ +// Out-of-range values +echo throws(function() { + unserialize('C:24:"MongoDB\BSON\UTCDateTime":53:{a:1:{s:12:"milliseconds";s:19:"9223372036854775808";}}'); +}, 'MongoDB\Driver\Exception\InvalidArgumentException'), "\n"; + +echo throws(function() { + unserialize('C:24:"MongoDB\BSON\UTCDateTime":54:{a:1:{s:12:"milliseconds";s:20:"-9223372036854775809";}}'); +}, 'MongoDB\Driver\Exception\InvalidArgumentException'), "\n"; + +echo throws(function() { + unserialize('C:24:"MongoDB\BSON\UTCDateTime":54:{a:1:{s:12:"milliseconds";s:20:"18446744073709551615";}}'); +}, 'MongoDB\Driver\Exception\InvalidArgumentException'), "\n"; ?> ===DONE=== @@ -17,4 +28,10 @@ echo throws(function() { --EXPECT-- OK: Got MongoDB\Driver\Exception\InvalidArgumentException Error parsing "1234.5678" as 64-bit integer for MongoDB\BSON\UTCDateTime initialization +OK: Got MongoDB\Driver\Exception\InvalidArgumentException +Error parsing "9223372036854775808" as 64-bit integer for MongoDB\BSON\UTCDateTime initialization +OK: Got MongoDB\Driver\Exception\InvalidArgumentException +Error parsing "-9223372036854775809" as 64-bit integer for MongoDB\BSON\UTCDateTime initialization +OK: Got MongoDB\Driver\Exception\InvalidArgumentException +Error parsing "18446744073709551615" as 64-bit integer for MongoDB\BSON\UTCDateTime initialization ===DONE=== diff --git a/tests/bson/bson-utcdatetime-serialization_error-004.phpt b/tests/bson/bson-utcdatetime-serialization_error-004.phpt index c5ceeb274..d84d78918 100644 --- a/tests/bson/bson-utcdatetime-serialization_error-004.phpt +++ b/tests/bson/bson-utcdatetime-serialization_error-004.phpt @@ -9,7 +9,18 @@ echo throws(function() { unserialize('O:24:"MongoDB\BSON\UTCDateTime":1:{s:12:"milliseconds";s:9:"1234.5678";}'); }, 'MongoDB\Driver\Exception\InvalidArgumentException'), "\n"; -/* TODO: Add tests for out-of-range values once CDRIVER-1377 is resolved */ +// Out-of-range values +echo throws(function() { + unserialize('O:24:"MongoDB\BSON\UTCDateTime":1:{s:12:"milliseconds";s:19:"9223372036854775808";}'); +}, 'MongoDB\Driver\Exception\InvalidArgumentException'), "\n"; + +echo throws(function() { + unserialize('O:24:"MongoDB\BSON\UTCDateTime":1:{s:12:"milliseconds";s:20:"-9223372036854775809";}'); +}, 'MongoDB\Driver\Exception\InvalidArgumentException'), "\n"; + +echo throws(function() { + unserialize('O:24:"MongoDB\BSON\UTCDateTime":1:{s:12:"milliseconds";s:20:"18446744073709551615";}'); +}, 'MongoDB\Driver\Exception\InvalidArgumentException'), "\n"; ?> ===DONE=== @@ -17,4 +28,10 @@ echo throws(function() { --EXPECT-- OK: Got MongoDB\Driver\Exception\InvalidArgumentException Error parsing "1234.5678" as 64-bit integer for MongoDB\BSON\UTCDateTime initialization +OK: Got MongoDB\Driver\Exception\InvalidArgumentException +Error parsing "9223372036854775808" as 64-bit integer for MongoDB\BSON\UTCDateTime initialization +OK: Got MongoDB\Driver\Exception\InvalidArgumentException +Error parsing "-9223372036854775809" as 64-bit integer for MongoDB\BSON\UTCDateTime initialization +OK: Got MongoDB\Driver\Exception\InvalidArgumentException +Error parsing "18446744073709551615" as 64-bit integer for MongoDB\BSON\UTCDateTime initialization ===DONE=== diff --git a/tests/bson/bson-utcdatetime-set_state_error-002.phpt b/tests/bson/bson-utcdatetime-set_state_error-002.phpt index 15c4c9377..0bf5f47ac 100644 --- a/tests/bson/bson-utcdatetime-set_state_error-002.phpt +++ b/tests/bson/bson-utcdatetime-set_state_error-002.phpt @@ -9,7 +9,18 @@ echo throws(function() { MongoDB\BSON\UTCDateTime::__set_state(['milliseconds' => '1234.5678']); }, 'MongoDB\Driver\Exception\InvalidArgumentException'), "\n"; -/* TODO: Add tests for out-of-range values once CDRIVER-1377 is resolved */ +// Out-of-range values +echo throws(function() { + MongoDB\BSON\UTCDateTime::__set_state(['milliseconds' => '9223372036854775808']); +}, 'MongoDB\Driver\Exception\InvalidArgumentException'), "\n"; + +echo throws(function() { + MongoDB\BSON\UTCDateTime::__set_state(['milliseconds' => '-9223372036854775809']); +}, 'MongoDB\Driver\Exception\InvalidArgumentException'), "\n"; + +echo throws(function() { + MongoDB\BSON\UTCDateTime::__set_state(['milliseconds' => '18446744073709551615']); +}, 'MongoDB\Driver\Exception\InvalidArgumentException'), "\n"; ?> ===DONE=== @@ -17,4 +28,10 @@ echo throws(function() { --EXPECT-- OK: Got MongoDB\Driver\Exception\InvalidArgumentException Error parsing "1234.5678" as 64-bit integer for MongoDB\BSON\UTCDateTime initialization +OK: Got MongoDB\Driver\Exception\InvalidArgumentException +Error parsing "9223372036854775808" as 64-bit integer for MongoDB\BSON\UTCDateTime initialization +OK: Got MongoDB\Driver\Exception\InvalidArgumentException +Error parsing "-9223372036854775809" as 64-bit integer for MongoDB\BSON\UTCDateTime initialization +OK: Got MongoDB\Driver\Exception\InvalidArgumentException +Error parsing "18446744073709551615" as 64-bit integer for MongoDB\BSON\UTCDateTime initialization ===DONE=== diff --git a/tests/bson/bson-utcdatetime-todatetime-001.phpt b/tests/bson/bson-utcdatetime-todatetime-001.phpt index a0fdf878b..4c34167c5 100644 --- a/tests/bson/bson-utcdatetime-todatetime-001.phpt +++ b/tests/bson/bson-utcdatetime-todatetime-001.phpt @@ -7,11 +7,13 @@ date.timezone=America/Los_Angeles $utcdatetime = new MongoDB\BSON\UTCDateTime("1416445411987"); $datetime = $utcdatetime->toDateTime(); +var_dump(get_class($datetime)); var_dump($datetime->format(DATE_RSS)); ?> ===DONE=== --EXPECT-- +string(8) "DateTime" string(31) "Thu, 20 Nov 2014 01:03:31 +0000" ===DONE=== diff --git a/tests/bson/bson-utcdatetime-todatetime-002.phpt b/tests/bson/bson-utcdatetime-todatetime-002.phpt index 6afd62b41..e003cd188 100644 --- a/tests/bson/bson-utcdatetime-todatetime-002.phpt +++ b/tests/bson/bson-utcdatetime-todatetime-002.phpt @@ -7,11 +7,13 @@ date.timezone=UTC $utcdatetime = new MongoDB\BSON\UTCDateTime("1416445411987"); $datetime = $utcdatetime->toDateTime(); +var_dump(get_class($datetime)); echo $datetime->format('U.u'), "\n"; ?> ===DONE=== --EXPECT-- +string(8) "DateTime" 1416445411.987000 ===DONE=== diff --git a/tests/bson/bson-utcdatetime-todatetimeimmutable-001.phpt b/tests/bson/bson-utcdatetime-todatetimeimmutable-001.phpt new file mode 100644 index 000000000..4d7bd8385 --- /dev/null +++ b/tests/bson/bson-utcdatetime-todatetimeimmutable-001.phpt @@ -0,0 +1,19 @@ +--TEST-- +MongoDB\BSON\UTCDateTime::toDateTimeImmutable() +--INI-- +date.timezone=America/Los_Angeles +--FILE-- +toDateTimeImmutable(); +var_dump(get_class($datetime)); +var_dump($datetime->format(DATE_RSS)); + +?> +===DONE=== + +--EXPECT-- +string(17) "DateTimeImmutable" +string(31) "Thu, 20 Nov 2014 01:03:31 +0000" +===DONE=== diff --git a/tests/bson/bson-utcdatetime-todatetimeimmutable-002.phpt b/tests/bson/bson-utcdatetime-todatetimeimmutable-002.phpt new file mode 100644 index 000000000..b959d0bc1 --- /dev/null +++ b/tests/bson/bson-utcdatetime-todatetimeimmutable-002.phpt @@ -0,0 +1,19 @@ +--TEST-- +MongoDB\BSON\UTCDateTime::toDateTimeImmutable() dumping seconds and microseconds +--INI-- +date.timezone=UTC +--FILE-- +toDateTimeImmutable(); +var_dump(get_class($datetime)); +echo $datetime->format('U.u'), "\n"; + +?> +===DONE=== + +--EXPECT-- +string(17) "DateTimeImmutable" +1416445411.987000 +===DONE=== diff --git a/tests/bson/bson-utcdatetime-todatetimeimmutable-003.phpt b/tests/bson/bson-utcdatetime-todatetimeimmutable-003.phpt new file mode 100644 index 000000000..c105b4424 --- /dev/null +++ b/tests/bson/bson-utcdatetime-todatetimeimmutable-003.phpt @@ -0,0 +1,33 @@ +--TEST-- +MongoDB\BSON\UTCDateTime::toDateTimeImmutable() with dates before the Unix epoch +--INI-- +date.timezone=UTC +--FILE-- +format(DateTimeInterface::RFC3339_EXTENDED), PHP_EOL; + + $utcDateTime = new MongoDB\BSON\UTCDateTime($dateTime); + + $newDate = $utcDateTime->toDateTimeImmutable(); + echo $newDate->format(DateTimeInterface::RFC3339_EXTENDED), PHP_EOL, PHP_EOL; +} + +?> +===DONE=== + +--EXPECT-- +1960-01-01T12:12:12.100+00:00 +1960-01-01T12:12:12.100+00:00 + +1969-12-31T23:59:59.999+00:00 +1969-12-31T23:59:59.999+00:00 + +===DONE=== diff --git a/tests/bson/bson-utcdatetime_error-003.phpt b/tests/bson/bson-utcdatetime_error-003.phpt index d18042c85..760eff8b2 100644 --- a/tests/bson/bson-utcdatetime_error-003.phpt +++ b/tests/bson/bson-utcdatetime_error-003.phpt @@ -9,7 +9,19 @@ echo throws(function() { new MongoDB\BSON\UTCDateTime('1234.5678'); }, 'MongoDB\Driver\Exception\InvalidArgumentException'), "\n"; -/* TODO: Add tests for out-of-range values once CDRIVER-1377 is resolved */ +// Out-of-range values +echo throws(function() { + new MongoDB\BSON\UTCDateTime('9223372036854775808'); +}, 'MongoDB\Driver\Exception\InvalidArgumentException'), "\n"; + +echo throws(function() { + new MongoDB\BSON\UTCDateTime('-9223372036854775809'); +}, 'MongoDB\Driver\Exception\InvalidArgumentException'), "\n"; + +echo throws(function() { + new MongoDB\BSON\UTCDateTime('18446744073709551615'); +}, 'MongoDB\Driver\Exception\InvalidArgumentException'), "\n"; + ?> ===DONE=== @@ -17,4 +29,10 @@ echo throws(function() { --EXPECT-- OK: Got MongoDB\Driver\Exception\InvalidArgumentException Error parsing "1234.5678" as 64-bit integer for MongoDB\BSON\UTCDateTime initialization +OK: Got MongoDB\Driver\Exception\InvalidArgumentException +Error parsing "9223372036854775808" as 64-bit integer for MongoDB\BSON\UTCDateTime initialization +OK: Got MongoDB\Driver\Exception\InvalidArgumentException +Error parsing "-9223372036854775809" as 64-bit integer for MongoDB\BSON\UTCDateTime initialization +OK: Got MongoDB\Driver\Exception\InvalidArgumentException +Error parsing "18446744073709551615" as 64-bit integer for MongoDB\BSON\UTCDateTime initialization ===DONE=== diff --git a/tests/bson/bug0274.phpt b/tests/bson/bug0274.phpt index f4fb09478..394eec398 100644 --- a/tests/bson/bug0274.phpt +++ b/tests/bson/bug0274.phpt @@ -47,7 +47,7 @@ Encoded BSON: 20 : 61 00 00 [a..] Testing top-level NumericArray: -{ "0" : 1, "1" : 2, "2" : 3 } +{ "0" : { "$numberInt" : "1" }, "1" : { "$numberInt" : "2" }, "2" : { "$numberInt" : "3" } } Encoded BSON: 0 : 1a 00 00 00 10 30 00 01 00 00 00 10 31 00 02 00 [.....0......1...] 10 : 00 00 10 32 00 03 00 00 00 00 [...2......] diff --git a/tests/bson/bug0544.phpt b/tests/bson/bug0544.phpt index d707b899b..57c1c0481 100644 --- a/tests/bson/bug0544.phpt +++ b/tests/bson/bug0544.phpt @@ -19,13 +19,13 @@ $tests = [ ]; foreach ($tests as $test) { - $bson = fromPHP($test); + $bson = MongoDB\BSON\fromPHP($test); /* Note: Although libbson can parse the extended JSON representation for * 64-bit integers (i.e. "$numberLong"), it currently prints them as * doubles (see: https://jira.mongodb.org/browse/CDRIVER-375). */ - printf("Test %s\n", toJSON($bson)); + printf("Test %s\n", MongoDB\BSON\toJSON($bson)); hex_dump($bson); - var_dump(toPHP($bson)); + var_dump(MongoDB\BSON\toPHP($bson)); echo "\n"; } @@ -33,57 +33,104 @@ foreach ($tests as $test) { ===DONE=== --EXPECTF-- +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s Test { "x" : -2147483648 } 0 : 0c 00 00 00 10 78 00 00 00 00 80 00 [.....x......] + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (%d) { ["x"]=> int(-2147483648) } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s Test { "x" : 2147483647 } 0 : 0c 00 00 00 10 78 00 ff ff ff 7f 00 [.....x......] + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (%d) { ["x"]=> int(2147483647) } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s Test { "x" : -4294967294 } 0 : 10 00 00 00 12 78 00 02 00 00 00 ff ff ff ff 00 [.....x..........] + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (%d) { ["x"]=> int(-4294967294) } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s Test { "x" : 4294967294 } 0 : 10 00 00 00 12 78 00 fe ff ff ff 00 00 00 00 00 [.....x..........] + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (%d) { ["x"]=> int(4294967294) } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s Test { "x" : -4294967295 } 0 : 10 00 00 00 12 78 00 01 00 00 00 ff ff ff ff 00 [.....x..........] + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (%d) { ["x"]=> int(-4294967295) } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s Test { "x" : 4294967295 } 0 : 10 00 00 00 12 78 00 ff ff ff ff 00 00 00 00 00 [.....x..........] + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (%d) { ["x"]=> int(4294967295) } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s Test { "x" : -9223372036854775807 } 0 : 10 00 00 00 12 78 00 01 00 00 00 00 00 00 80 00 [.....x..........] + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (%d) { ["x"]=> int(-9223372036854775807) } + +Deprecated: Function MongoDB\BSON\fromPHP() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toJSON() is deprecated in %s Test { "x" : 9223372036854775807 } 0 : 10 00 00 00 12 78 00 ff ff ff ff ff ff ff 7f 00 [.....x..........] + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (%d) { ["x"]=> int(9223372036854775807) diff --git a/tests/bson/bug0592.phpt b/tests/bson/bug0592.phpt index 7dc22d787..8ed6f2080 100644 --- a/tests/bson/bug0592.phpt +++ b/tests/bson/bug0592.phpt @@ -23,7 +23,7 @@ $tests = [ foreach ($tests as $json) { printf("Test %s\n", $json); try { - $encoded = toPHP(fromJSON($json)); + $encoded = MongoDB\BSON\toPHP(MongoDB\BSON\fromJSON($json)); var_dump( $encoded ); } catch ( MongoDB\Driver\Exception\InvalidArgumentException $e ) { echo "MongoDB\Driver\Exception\InvalidArgumentException: ", $e->getMessage(), "\n"; @@ -36,18 +36,30 @@ foreach ($tests as $json) { --EXPECTF-- Test { "x": { "$numberLong": "-2147483648" }} + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (%d) { ["x"]=> int(-2147483648) } Test { "x": { "$numberLong": "2147483647" }} + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (%d) { ["x"]=> int(2147483647) } Test { "x": { "$numberLong": "4294967294" }} + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (%d) { ["x"]=> object(MongoDB\BSON\Int64)#%d (%d) { @@ -57,6 +69,10 @@ object(stdClass)#%d (%d) { } Test { "x": { "$numberLong": "4294967295" }} + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (%d) { ["x"]=> object(MongoDB\BSON\Int64)#%d (%d) { @@ -66,6 +82,10 @@ object(stdClass)#%d (%d) { } Test { "x": { "$numberLong": "9223372036854775807" }} + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (%d) { ["x"]=> object(MongoDB\BSON\Int64)#%d (%d) { @@ -75,18 +95,30 @@ object(stdClass)#%d (%d) { } Test { "longFieldName": { "$numberLong": "-2147483648" }} + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (%d) { ["longFieldName"]=> int(-2147483648) } Test { "longFieldName": { "$numberLong": "2147483647" }} + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (%d) { ["longFieldName"]=> int(2147483647) } Test { "longFieldName": { "$numberLong": "4294967294" }} + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (%d) { ["longFieldName"]=> object(MongoDB\BSON\Int64)#%d (%d) { @@ -96,6 +128,10 @@ object(stdClass)#%d (%d) { } Test { "longFieldName": { "$numberLong": "4294967295" }} + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (%d) { ["longFieldName"]=> object(MongoDB\BSON\Int64)#%d (%d) { @@ -105,6 +141,10 @@ object(stdClass)#%d (%d) { } Test { "longFieldName": { "$numberLong": "9223372036854775807" }} + +Deprecated: Function MongoDB\BSON\fromJSON() is deprecated in %s + +Deprecated: Function MongoDB\BSON\toPHP() is deprecated in %s object(stdClass)#%d (%d) { ["longFieldName"]=> object(MongoDB\BSON\Int64)#%d (%d) { diff --git a/tests/bson/bug1266.phpt b/tests/bson/bug1266.phpt index c11fc7962..41bcb7dbd 100644 --- a/tests/bson/bug1266.phpt +++ b/tests/bson/bug1266.phpt @@ -23,8 +23,7 @@ $a = <<toPHP()); ?> ===DONE=== diff --git a/tests/bson/bug1839-001.phpt b/tests/bson/bug1839-001.phpt index 3e23d6b13..3c65bbd52 100644 --- a/tests/bson/bug1839-001.phpt +++ b/tests/bson/bug1839-001.phpt @@ -20,12 +20,12 @@ function createTypemap() } $typemap = createTypemap(); -$bson = MongoDB\BSON\fromPhp((object) []); +$bson = MongoDB\BSON\Document::fromPHP((object) []); echo "Before:\n"; debug_zval_dump($typemap); -MongoDB\BSON\toPHP($bson, $typemap); +$bson->toPHP($typemap); echo "After:\n"; debug_zval_dump($typemap); diff --git a/tests/bson/bug1839-002.phpt b/tests/bson/bug1839-002.phpt index 107a7a540..dc24f8756 100644 --- a/tests/bson/bug1839-002.phpt +++ b/tests/bson/bug1839-002.phpt @@ -12,12 +12,12 @@ $rootValue = chr(ord('a')) . 'rray'; $documentValue = chr(ord('a')) . 'rray'; $typemap = ['root' => &$rootValue, 'document' => &$documentValue]; -$bson = MongoDB\BSON\fromPhp((object) []); +$bson = MongoDB\BSON\Document::fromPHP((object) []); echo "Before:\n"; debug_zval_dump($typemap); -MongoDB\BSON\toPHP($bson, $typemap); +$bson->toPHP($typemap); echo "After:\n"; debug_zval_dump($typemap); diff --git a/tests/bson/bug1839-003.phpt b/tests/bson/bug1839-003.phpt index 813850af1..f22b4d61d 100644 --- a/tests/bson/bug1839-003.phpt +++ b/tests/bson/bug1839-003.phpt @@ -18,12 +18,12 @@ function createTypemap() } $typemap = createTypemap(); -$bson = MongoDB\BSON\fromPhp((object) []); +$bson = MongoDB\BSON\Document::fromPHP((object) []); echo "Before:\n"; debug_zval_dump($typemap); -MongoDB\BSON\toPHP($bson, $typemap); +$bson->toPHP($typemap); echo "After:\n"; debug_zval_dump($typemap); diff --git a/tests/bson/bug1839-004.phpt b/tests/bson/bug1839-004.phpt index 74a7f9b51..08be06931 100644 --- a/tests/bson/bug1839-004.phpt +++ b/tests/bson/bug1839-004.phpt @@ -11,12 +11,12 @@ $rootValue = 'array'; $documentValue = 'array'; $typemap = ['root' => &$rootValue, 'document' => &$documentValue]; -$bson = MongoDB\BSON\fromPhp((object) []); +$bson = MongoDB\BSON\Document::fromPHP((object) []); echo "Before:\n"; debug_zval_dump($typemap); -MongoDB\BSON\toPHP($bson, $typemap); +$bson->toPHP($typemap); echo "After:\n"; debug_zval_dump($typemap); diff --git a/tests/bson/bug1839-005.phpt b/tests/bson/bug1839-005.phpt index cebc90d3f..697dbb65a 100644 --- a/tests/bson/bug1839-005.phpt +++ b/tests/bson/bug1839-005.phpt @@ -20,12 +20,12 @@ function createTypemap() } $typemap = createTypemap(); -$bson = MongoDB\BSON\fromPhp((object) []); +$bson = MongoDB\BSON\Document::fromPHP((object) []); echo "Before:\n"; debug_zval_dump($typemap); -MongoDB\BSON\toPHP($bson, $typemap); +$bson->toPHP($typemap); echo "After:\n"; debug_zval_dump($typemap); diff --git a/tests/bson/bug1839-006.phpt b/tests/bson/bug1839-006.phpt index 79f16383b..58959c609 100644 --- a/tests/bson/bug1839-006.phpt +++ b/tests/bson/bug1839-006.phpt @@ -12,12 +12,12 @@ $rootValue = chr(ord('a')) . 'rray'; $documentValue = chr(ord('a')) . 'rray'; $typemap = ['root' => &$rootValue, 'document' => &$documentValue]; -$bson = MongoDB\BSON\fromPhp((object) []); +$bson = MongoDB\BSON\Document::fromPHP((object) []); echo "Before:\n"; debug_zval_dump($typemap); -MongoDB\BSON\toPHP($bson, $typemap); +$bson->toPHP($typemap); echo "After:\n"; debug_zval_dump($typemap); diff --git a/tests/bson/bug1839-007.phpt b/tests/bson/bug1839-007.phpt index dab9756f6..f446cb712 100644 --- a/tests/bson/bug1839-007.phpt +++ b/tests/bson/bug1839-007.phpt @@ -18,12 +18,12 @@ function createTypemap() } $typemap = createTypemap(); -$bson = MongoDB\BSON\fromPhp((object) []); +$bson = MongoDB\BSON\Document::fromPHP((object) []); echo "Before:\n"; debug_zval_dump($typemap); -MongoDB\BSON\toPHP($bson, $typemap); +$bson->toPHP($typemap); echo "After:\n"; debug_zval_dump($typemap); diff --git a/tests/bson/bug1839-008.phpt b/tests/bson/bug1839-008.phpt index eaa20a318..3fbb67992 100644 --- a/tests/bson/bug1839-008.phpt +++ b/tests/bson/bug1839-008.phpt @@ -11,12 +11,12 @@ $rootValue = 'array'; $documentValue = 'array'; $typemap = ['root' => &$rootValue, 'document' => &$documentValue]; -$bson = MongoDB\BSON\fromPhp((object) []); +$bson = MongoDB\BSON\Document::fromPHP((object) []); echo "Before:\n"; debug_zval_dump($typemap); -MongoDB\BSON\toPHP($bson, $typemap); +$bson->toPHP($typemap); echo "After:\n"; debug_zval_dump($typemap); diff --git a/tests/bulk/bulkwrite-delete-001.phpt b/tests/bulk/bulkwrite-delete-001.phpt index b0bae3521..d8a999b84 100644 --- a/tests/bulk/bulkwrite-delete-001.phpt +++ b/tests/bulk/bulkwrite-delete-001.phpt @@ -13,7 +13,7 @@ class MyClass implements MongoDB\BSON\Persistable private $id; private $child; - public function __construct($id, MyClass $child = null) + public function __construct($id, ?MyClass $child = null) { $this->id = $id; $this->child = $child; diff --git a/tests/bulk/bulkwrite-insert-001.phpt b/tests/bulk/bulkwrite-insert-001.phpt index 4160a95f8..b2e57b11b 100644 --- a/tests/bulk/bulkwrite-insert-001.phpt +++ b/tests/bulk/bulkwrite-insert-001.phpt @@ -13,7 +13,7 @@ class MyClass implements MongoDB\BSON\Persistable private $id; private $child; - public function __construct($id, MyClass $child = null) + public function __construct($id, ?MyClass $child = null) { $this->id = $id; $this->child = $child; diff --git a/tests/bulk/bulkwrite-update-001.phpt b/tests/bulk/bulkwrite-update-001.phpt index a02a78a90..e6e530984 100644 --- a/tests/bulk/bulkwrite-update-001.phpt +++ b/tests/bulk/bulkwrite-update-001.phpt @@ -13,7 +13,7 @@ class MyClass implements MongoDB\BSON\Persistable private $id; private $child; - public function __construct($id, MyClass $child = null) + public function __construct($id, ?MyClass $child = null) { $this->id = $id; $this->child = $child; diff --git a/tests/clientEncryption/clientEncryption-constants.phpt b/tests/clientEncryption/clientEncryption-constants.phpt index f03d462c6..cdbaba805 100644 --- a/tests/clientEncryption/clientEncryption-constants.phpt +++ b/tests/clientEncryption/clientEncryption-constants.phpt @@ -7,19 +7,23 @@ var_dump(MongoDB\Driver\ClientEncryption::AEAD_AES_256_CBC_HMAC_SHA_512_DETERMIN var_dump(MongoDB\Driver\ClientEncryption::AEAD_AES_256_CBC_HMAC_SHA_512_RANDOM); var_dump(MongoDB\Driver\ClientEncryption::ALGORITHM_INDEXED); var_dump(MongoDB\Driver\ClientEncryption::ALGORITHM_UNINDEXED); +var_dump(MongoDB\Driver\ClientEncryption::ALGORITHM_RANGE); var_dump(MongoDB\Driver\ClientEncryption::ALGORITHM_RANGE_PREVIEW); var_dump(MongoDB\Driver\ClientEncryption::QUERY_TYPE_EQUALITY); +var_dump(MongoDB\Driver\ClientEncryption::QUERY_TYPE_RANGE); var_dump(MongoDB\Driver\ClientEncryption::QUERY_TYPE_RANGE_PREVIEW); ?> ===DONE=== ---EXPECT-- +--EXPECTF-- string(43) "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic" string(36) "AEAD_AES_256_CBC_HMAC_SHA_512-Random" string(7) "Indexed" string(9) "Unindexed" -string(12) "RangePreview" +string(5) "Range" +%Astring(12) "RangePreview" string(8) "equality" -string(12) "rangePreview" +string(5) "range" +%Astring(12) "rangePreview" ===DONE=== diff --git a/tests/clientEncryption/clientEncryption-encryptExpression-001.phpt b/tests/clientEncryption/clientEncryption-encryptExpression-001.phpt index f3d61ee49..24246fd18 100644 --- a/tests/clientEncryption/clientEncryption-encryptExpression-001.phpt +++ b/tests/clientEncryption/clientEncryption-encryptExpression-001.phpt @@ -22,10 +22,10 @@ $keyId = $clientEncryption->createDataKey('local'); $encryptOpts = [ 'keyId' => $keyId, - 'algorithm' => MongoDB\Driver\ClientEncryption::ALGORITHM_RANGE_PREVIEW, - 'queryType' => MongoDB\Driver\ClientEncryption::QUERY_TYPE_RANGE_PREVIEW, + 'algorithm' => MongoDB\Driver\ClientEncryption::ALGORITHM_RANGE, + 'queryType' => MongoDB\Driver\ClientEncryption::QUERY_TYPE_RANGE, 'contentionFactor' => 0, - 'rangeOpts' => ['min' => 0, 'max' => 200, 'sparsity' => 1], + 'rangeOpts' => ['min' => 0, 'max' => 200, 'sparsity' => 1, 'trimFactor' => 1], ]; $expr = [ diff --git a/tests/clientEncryption/clientEncryption-encryptExpression_error-002.phpt b/tests/clientEncryption/clientEncryption-encryptExpression_error-002.phpt index b65da9f2a..e8029bfcd 100644 --- a/tests/clientEncryption/clientEncryption-encryptExpression_error-002.phpt +++ b/tests/clientEncryption/clientEncryption-encryptExpression_error-002.phpt @@ -22,10 +22,10 @@ $keyId = $clientEncryption->createDataKey('local'); $encryptOpts = [ 'keyId' => $keyId, - 'algorithm' => MongoDB\Driver\ClientEncryption::ALGORITHM_RANGE_PREVIEW, - 'queryType' => MongoDB\Driver\ClientEncryption::QUERY_TYPE_RANGE_PREVIEW, + 'algorithm' => MongoDB\Driver\ClientEncryption::ALGORITHM_RANGE, + 'queryType' => MongoDB\Driver\ClientEncryption::QUERY_TYPE_RANGE, 'contentionFactor' => 0, - 'rangeOpts' => ['min' => 0, 'max' => 200, 'sparsity' => 1], + 'rangeOpts' => ['min' => 0, 'max' => 200, 'sparsity' => 1, 'trimFactor' => 1], ]; echo throws(function() use ($clientEncryption, $encryptOpts) { diff --git a/tests/command/command-ctor-001.phpt b/tests/command/command-ctor-001.phpt index 024b34d96..7716abb52 100644 --- a/tests/command/command-ctor-001.phpt +++ b/tests/command/command-ctor-001.phpt @@ -13,7 +13,7 @@ class MyClass implements MongoDB\BSON\Persistable private $id; private $child; - public function __construct($id, MyClass $child = null) + public function __construct($id, ?MyClass $child = null) { $this->id = $id; $this->child = $child; diff --git a/tests/connect/bug1015.phpt b/tests/connect/bug1015.phpt index 49c1214d7..ed6589901 100644 --- a/tests/connect/bug1015.phpt +++ b/tests/connect/bug1015.phpt @@ -17,7 +17,7 @@ PHPC-1015: Initial DNS Seedlist test require_once __DIR__ . "/../utils/basic.inc"; $m = create_test_manager("mongodb+srv://test1.test.build.10gen.cc/"); -$s = $m->selectServer( new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_NEAREST ) ); +$s = $m->selectServer( new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::NEAREST ) ); $servers = $m->getServers(); foreach ( $servers as $server ) diff --git a/tests/manager/manager-ctor-duplicate-option-001.phpt b/tests/manager/manager-ctor-duplicate-option-001.phpt index 1f4e09ac8..02d3affda 100644 --- a/tests/manager/manager-ctor-duplicate-option-001.phpt +++ b/tests/manager/manager-ctor-duplicate-option-001.phpt @@ -5,11 +5,11 @@ MongoDB\Driver\Manager::__construct() with duplicate read preference option $manager = new MongoDB\Driver\Manager(null, ['readPreference' => 'primary', 'readpreference' => 'secondary']); -echo $manager->getReadPreference()->getMode(), "\n"; +echo $manager->getReadPreference()->getModeString(), "\n"; ?> ===DONE=== --EXPECT-- -2 +secondary ===DONE=== diff --git a/tests/manager/manager-executeCommand-002.phpt b/tests/manager/manager-executeCommand-002.phpt index c8288fd55..6dc75ee29 100644 --- a/tests/manager/manager-executeCommand-002.phpt +++ b/tests/manager/manager-executeCommand-002.phpt @@ -11,8 +11,8 @@ require_once __DIR__ . "/../utils/basic.inc"; $manager = create_test_manager(); -$primary = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY); -$secondary = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY); +$primary = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::PRIMARY); +$secondary = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY); echo "Testing primary:\n"; $command = new MongoDB\Driver\Command(['ping' => 1]); diff --git a/tests/manager/manager-executeCommand-003.phpt b/tests/manager/manager-executeCommand-003.phpt index c6077a222..289d564af 100644 --- a/tests/manager/manager-executeCommand-003.phpt +++ b/tests/manager/manager-executeCommand-003.phpt @@ -11,8 +11,8 @@ require_once __DIR__ . "/../utils/basic.inc"; $manager = create_test_manager(); -$primary = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY); -$secondary = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY); +$primary = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::PRIMARY); +$secondary = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY); echo "Testing primary:\n"; $command = new MongoDB\Driver\Command(['ping' => 1]); diff --git a/tests/manager/manager-executeCommand-004.phpt b/tests/manager/manager-executeCommand-004.phpt index 6f53691d2..2cab07a81 100644 --- a/tests/manager/manager-executeCommand-004.phpt +++ b/tests/manager/manager-executeCommand-004.phpt @@ -24,7 +24,7 @@ $manager = create_test_manager(); DATABASE_NAME, $command, [ - 'readPreference' => new \MongoDB\Driver\ReadPreference(\MongoDB\Driver\ReadPreference::RP_SECONDARY), + 'readPreference' => new \MongoDB\Driver\ReadPreference(\MongoDB\Driver\ReadPreference::SECONDARY), 'readConcern' => new \MongoDB\Driver\ReadConcern(\MongoDB\Driver\ReadConcern::LOCAL), 'writeConcern' => new \MongoDB\Driver\WriteConcern(\MongoDB\Driver\WriteConcern::MAJORITY), ] diff --git a/tests/manager/manager-executeQuery-003.phpt b/tests/manager/manager-executeQuery-003.phpt index ee8b89d43..799bf4848 100644 --- a/tests/manager/manager-executeQuery-003.phpt +++ b/tests/manager/manager-executeQuery-003.phpt @@ -16,8 +16,8 @@ $bulk = new MongoDB\Driver\BulkWrite(); $bulk->insert(['_id' => 1, 'x' => 2, 'y' => 3]); $manager->executeBulkWrite(NS, $bulk); -$primary = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY); -$secondary = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY); +$primary = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::PRIMARY); +$secondary = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY); echo "Testing primary:\n"; $query = new MongoDB\Driver\Query(['x' => 3], ['projection' => ['y' => 1]]); diff --git a/tests/manager/manager-executeQuery-004.phpt b/tests/manager/manager-executeQuery-004.phpt index c7903bb58..80e8a243d 100644 --- a/tests/manager/manager-executeQuery-004.phpt +++ b/tests/manager/manager-executeQuery-004.phpt @@ -16,8 +16,8 @@ $bulk = new MongoDB\Driver\BulkWrite(); $bulk->insert(['_id' => 1, 'x' => 2, 'y' => 3]); $manager->executeBulkWrite(NS, $bulk); -$primary = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY); -$secondary = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY); +$primary = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::PRIMARY); +$secondary = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY); echo "Testing primary:\n"; $query = new MongoDB\Driver\Query(['x' => 3], ['projection' => ['y' => 1]]); diff --git a/tests/manager/manager-executeReadCommand-001.phpt b/tests/manager/manager-executeReadCommand-001.phpt index d8a506f0e..c693da8d1 100644 --- a/tests/manager/manager-executeReadCommand-001.phpt +++ b/tests/manager/manager-executeReadCommand-001.phpt @@ -25,7 +25,7 @@ $manager = create_test_manager(); DATABASE_NAME, $command, [ - 'readPreference' => new \MongoDB\Driver\ReadPreference(\MongoDB\Driver\ReadPreference::RP_SECONDARY), + 'readPreference' => new \MongoDB\Driver\ReadPreference(\MongoDB\Driver\ReadPreference::SECONDARY), 'readConcern' => new \MongoDB\Driver\ReadConcern(\MongoDB\Driver\ReadConcern::MAJORITY), ] ); diff --git a/tests/manager/manager-selectserver_error-001.phpt b/tests/manager/manager-selectserver_error-001.phpt index 87643fb3b..0cbfc28c6 100644 --- a/tests/manager/manager-selectserver_error-001.phpt +++ b/tests/manager/manager-selectserver_error-001.phpt @@ -4,7 +4,7 @@ MongoDB\Driver\Manager::selectServer() should not issue warning before exception 1]); diff --git a/tests/manager/manager-startSession_error-001.phpt b/tests/manager/manager-startSession_error-001.phpt index e84418b06..aa6f77c68 100644 --- a/tests/manager/manager-startSession_error-001.phpt +++ b/tests/manager/manager-startSession_error-001.phpt @@ -20,7 +20,7 @@ $options = [ [ 'readPreference' => new \MongoDB\Driver\ReadConcern( \MongoDB\Driver\ReadConcern::LOCAL ) ], [ 'writeConcern' => 42 ], [ 'writeConcern' => new stdClass ], - [ 'writeConcern' => new \MongoDB\Driver\ReadPreference( \MongoDB\Driver\ReadPreference::RP_SECONDARY ) ], + [ 'writeConcern' => new \MongoDB\Driver\ReadPreference( \MongoDB\Driver\ReadPreference::SECONDARY ) ], [ 'readConcern' => new \MongoDB\Driver\ReadConcern( \MongoDB\Driver\ReadConcern::LOCAL ), @@ -28,11 +28,11 @@ $options = [ ], [ 'readConcern' => new \MongoDB\Driver\ReadConcern( \MongoDB\Driver\ReadConcern::LOCAL ), - 'writeConcern' => new \MongoDB\Driver\ReadPreference( \MongoDB\Driver\ReadPreference::RP_SECONDARY ), + 'writeConcern' => new \MongoDB\Driver\ReadPreference( \MongoDB\Driver\ReadPreference::SECONDARY ), ], [ - 'readPreference' => new \MongoDB\Driver\ReadPreference( \MongoDB\Driver\ReadPreference::RP_SECONDARY ), - 'writeConcern' => new \MongoDB\Driver\ReadPreference( \MongoDB\Driver\ReadPreference::RP_SECONDARY ), + 'readPreference' => new \MongoDB\Driver\ReadPreference( \MongoDB\Driver\ReadPreference::SECONDARY ), + 'writeConcern' => new \MongoDB\Driver\ReadPreference( \MongoDB\Driver\ReadPreference::SECONDARY ), ], 42, diff --git a/tests/ocsp-failure.phpt b/tests/ocsp-failure.phpt index 3cc0bc4d6..e7fbc2f85 100644 --- a/tests/ocsp-failure.phpt +++ b/tests/ocsp-failure.phpt @@ -29,5 +29,5 @@ $m->executeCommand('admin', $ping); --EXPECTF-- OK: Got MongoDB\Driver\Exception\ConnectionTimeoutException -No suitable servers found (`serverSelectionTryOnce` set): [%s calling %s on '%s:%d'] +No suitable servers found (`serverSelectionTryOnce` set): %s ===DONE=== diff --git a/tests/query/query-ctor-001.phpt b/tests/query/query-ctor-001.phpt index 98861f87c..b2f88a1d4 100644 --- a/tests/query/query-ctor-001.phpt +++ b/tests/query/query-ctor-001.phpt @@ -13,7 +13,7 @@ class MyClass implements MongoDB\BSON\Persistable private $id; private $child; - public function __construct($id, MyClass $child = null) + public function __construct($id, ?MyClass $child = null) { $this->id = $id; $this->child = $child; diff --git a/tests/readPreference/bug0146-001.phpt b/tests/readPreference/bug0146-001.phpt index 1f24a575f..563e01700 100644 --- a/tests/readPreference/bug0146-001.phpt +++ b/tests/readPreference/bug0146-001.phpt @@ -16,13 +16,13 @@ $bulk = new MongoDB\Driver\BulkWrite(); $bulk->insert(array('my' => 'document')); $manager->executeBulkWrite(NS, $bulk); -$rps = array( - MongoDB\Driver\ReadPreference::RP_PRIMARY, - MongoDB\Driver\ReadPreference::RP_PRIMARY_PREFERRED, - MongoDB\Driver\ReadPreference::RP_SECONDARY, - MongoDB\Driver\ReadPreference::RP_SECONDARY_PREFERRED, - MongoDB\Driver\ReadPreference::RP_NEAREST, -); +$rps = [ + MongoDB\Driver\ReadPreference::PRIMARY, + MongoDB\Driver\ReadPreference::PRIMARY_PREFERRED, + MongoDB\Driver\ReadPreference::SECONDARY, + MongoDB\Driver\ReadPreference::SECONDARY_PREFERRED, + MongoDB\Driver\ReadPreference::NEAREST, +]; foreach($rps as $r) { $rp = new MongoDB\Driver\ReadPreference($r); diff --git a/tests/readPreference/bug0851-001.phpt b/tests/readPreference/bug0851-001.phpt index faaa082cb..8c32761c0 100644 --- a/tests/readPreference/bug0851-001.phpt +++ b/tests/readPreference/bug0851-001.phpt @@ -8,7 +8,7 @@ $tagSets = [ [], ]; -$rp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY_PREFERRED, $tagSets); +$rp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY_PREFERRED, $tagSets); var_dump($tagSets); /* Dump the Manager's ReadPreference to ensure that each element in the $tagSets diff --git a/tests/readPreference/readpreference-bsonserialize-001.phpt b/tests/readPreference/readpreference-bsonserialize-001.phpt index 670325ddc..50980cab8 100644 --- a/tests/readPreference/readpreference-bsonserialize-001.phpt +++ b/tests/readPreference/readpreference-bsonserialize-001.phpt @@ -6,15 +6,15 @@ MongoDB\Driver\ReadPreference::bsonSerialize() require_once __DIR__ . '/../utils/basic.inc'; $tests = [ - new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY), - new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY_PREFERRED), - new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY), - new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY_PREFERRED), - new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_NEAREST), - new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY, []), - new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY, [['dc' => 'ny']]), - new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY, [['dc' => 'ny'], ['dc' => 'sf', 'use' => 'reporting'], []]), - new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY, null, ['maxStalenessSeconds' => 1000]), + new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::PRIMARY), + new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::PRIMARY_PREFERRED), + new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY), + new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY_PREFERRED), + new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::NEAREST), + new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::PRIMARY, []), + new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY, [['dc' => 'ny']]), + new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY, [['dc' => 'ny'], ['dc' => 'sf', 'use' => 'reporting'], []]), + new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY, null, ['maxStalenessSeconds' => 1000]), ]; foreach ($tests as $test) { @@ -33,5 +33,5 @@ foreach ($tests as $test) { { "mode" : "primary" } { "mode" : "secondary", "tags" : [ { "dc" : "ny" } ] } { "mode" : "secondary", "tags" : [ { "dc" : "ny" }, { "dc" : "sf", "use" : "reporting" }, { } ] } -{ "mode" : "secondary", "maxStalenessSeconds" : 1000 } +{ "mode" : "secondary", "maxStalenessSeconds" : { "$numberInt" : "1000" } } ===DONE=== diff --git a/tests/readPreference/readpreference-bsonserialize-002.phpt b/tests/readPreference/readpreference-bsonserialize-002.phpt index 8c4d5349f..f9565eea5 100644 --- a/tests/readPreference/readpreference-bsonserialize-002.phpt +++ b/tests/readPreference/readpreference-bsonserialize-002.phpt @@ -6,15 +6,15 @@ MongoDB\Driver\ReadPreference::bsonSerialize() returns an object require_once __DIR__ . '/../utils/basic.inc'; $tests = [ - new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY), - new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY_PREFERRED), - new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY), - new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY_PREFERRED), - new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_NEAREST), - new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY, []), - new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY, [['dc' => 'ny']]), - new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY, [['dc' => 'ny'], ['dc' => 'sf', 'use' => 'reporting'], []]), - new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY, null, ['maxStalenessSeconds' => 1000]), + new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::PRIMARY), + new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::PRIMARY_PREFERRED), + new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY), + new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY_PREFERRED), + new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::NEAREST), + new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::PRIMARY, []), + new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY, [['dc' => 'ny']]), + new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY, [['dc' => 'ny'], ['dc' => 'sf', 'use' => 'reporting'], []]), + new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY, null, ['maxStalenessSeconds' => 1000]), ]; foreach ($tests as $test) { diff --git a/tests/readPreference/readpreference-constants.phpt b/tests/readPreference/readpreference-constants-001.phpt similarity index 67% rename from tests/readPreference/readpreference-constants.phpt rename to tests/readPreference/readpreference-constants-001.phpt index 060638339..8a5e94657 100644 --- a/tests/readPreference/readpreference-constants.phpt +++ b/tests/readPreference/readpreference-constants-001.phpt @@ -3,34 +3,24 @@ MongoDB\Driver\ReadPreference constants --FILE-- ===DONE=== --EXPECTF-- -int(1) -int(5) -int(2) -int(6) -int(10) -int(-1) -int(90) string(7) "primary" string(16) "primaryPreferred" string(9) "secondary" string(18) "secondaryPreferred" string(7) "nearest" +int(-1) +int(90) ===DONE=== diff --git a/tests/readPreference/readpreference-constants-002.phpt b/tests/readPreference/readpreference-constants-002.phpt new file mode 100644 index 000000000..7ce8182e6 --- /dev/null +++ b/tests/readPreference/readpreference-constants-002.phpt @@ -0,0 +1,33 @@ +--TEST-- +MongoDB\Driver\ReadPreference deprecated constants +--SKIPIF-- + + +--FILE-- + +===DONE=== + +--EXPECTF-- +Deprecated: Constant MongoDB\Driver\ReadPreference::RP_PRIMARY is deprecated in %s +int(1) + +Deprecated: Constant MongoDB\Driver\ReadPreference::RP_PRIMARY_PREFERRED is deprecated in %s +int(5) + +Deprecated: Constant MongoDB\Driver\ReadPreference::RP_SECONDARY is deprecated in %s +int(2) + +Deprecated: Constant MongoDB\Driver\ReadPreference::RP_SECONDARY_PREFERRED is deprecated in %s +int(6) + +Deprecated: Constant MongoDB\Driver\ReadPreference::RP_NEAREST is deprecated in %s +int(10) +===DONE=== diff --git a/tests/readPreference/readpreference-ctor-001.phpt b/tests/readPreference/readpreference-ctor-001.phpt index 607f67a0d..da43b5b8c 100644 --- a/tests/readPreference/readpreference-ctor-001.phpt +++ b/tests/readPreference/readpreference-ctor-001.phpt @@ -3,12 +3,12 @@ MongoDB\Driver\ReadPreference construction --FILE-- 'one']])); -var_dump(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY, [])); -var_dump(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY, null, ['maxStalenessSeconds' => 1000])); -var_dump(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY, null, ['hedge' => ['enabled' => true]])); -var_dump(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY, null, ['hedge' => []])); +var_dump(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::PRIMARY)); +var_dump(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY, [['tag' => 'one']])); +var_dump(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::PRIMARY, [])); +var_dump(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY, null, ['maxStalenessSeconds' => 1000])); +var_dump(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY, null, ['hedge' => ['enabled' => true]])); +var_dump(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY, null, ['hedge' => []])); ?> ===DONE=== diff --git a/tests/readPreference/readpreference-ctor-002.phpt b/tests/readPreference/readpreference-ctor-002.phpt index d3d1400ac..5949f172e 100644 --- a/tests/readPreference/readpreference-ctor-002.phpt +++ b/tests/readPreference/readpreference-ctor-002.phpt @@ -5,23 +5,23 @@ MongoDB\Driver\ReadPreference construction with strings $data = [ "primary", "PrImAry", - MongoDB\Driver\ReadPreference::RP_PRIMARY, + MongoDB\Driver\ReadPreference::PRIMARY, "primaryPreferred", "primarypreferred", - MongoDB\Driver\ReadPreference::RP_PRIMARY_PREFERRED, + MongoDB\Driver\ReadPreference::PRIMARY_PREFERRED, "secondary", "SEcOndArY", - MongoDB\Driver\ReadPreference::RP_SECONDARY, + MongoDB\Driver\ReadPreference::SECONDARY, "secondaryPreferred", "secondarypreferred", - MongoDB\Driver\ReadPreference::RP_SECONDARY_PREFERRED, + MongoDB\Driver\ReadPreference::SECONDARY_PREFERRED, "nearest", "NeaRest", - MongoDB\Driver\ReadPreference::RP_NEAREST, + MongoDB\Driver\ReadPreference::NEAREST, ]; foreach ($data as $item) { diff --git a/tests/readPreference/readpreference-ctor-003.phpt b/tests/readPreference/readpreference-ctor-003.phpt new file mode 100644 index 000000000..ef6459c1e --- /dev/null +++ b/tests/readPreference/readpreference-ctor-003.phpt @@ -0,0 +1,70 @@ +--TEST-- +MongoDB\Driver\ReadPreference construction with integer constants (PHP < 8.3) +--SKIPIF-- + +=', '8.3.0'); ?> +--FILE-- + 'one']])); +var_dump(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY, [])); +var_dump(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY, null, ['maxStalenessSeconds' => 1000])); +var_dump(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY, null, ['hedge' => ['enabled' => true]])); +var_dump(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY, null, ['hedge' => []])); + +?> +===DONE=== + +--EXPECTF-- +Deprecated: MongoDB\Driver\ReadPreference::__construct(): Passing an integer mode to "MongoDB\Driver\ReadPreference::__construct" is deprecated and will be removed in a future release. in %s +object(MongoDB\Driver\ReadPreference)#%d (%d) { + ["mode"]=> + string(7) "primary" +} + +Deprecated: MongoDB\Driver\ReadPreference::__construct(): Passing an integer mode to "MongoDB\Driver\ReadPreference::__construct" is deprecated and will be removed in a future release. in %s +object(MongoDB\Driver\ReadPreference)#%d (%d) { + ["mode"]=> + string(9) "secondary" + ["tags"]=> + array(1) { + [0]=> + object(stdClass)#%d (%d) { + ["tag"]=> + string(3) "one" + } + } +} + +Deprecated: MongoDB\Driver\ReadPreference::__construct(): Passing an integer mode to "MongoDB\Driver\ReadPreference::__construct" is deprecated and will be removed in a future release. in %s +object(MongoDB\Driver\ReadPreference)#%d (%d) { + ["mode"]=> + string(7) "primary" +} + +Deprecated: MongoDB\Driver\ReadPreference::__construct(): Passing an integer mode to "MongoDB\Driver\ReadPreference::__construct" is deprecated and will be removed in a future release. in %s +object(MongoDB\Driver\ReadPreference)#%d (%d) { + ["mode"]=> + string(9) "secondary" + ["maxStalenessSeconds"]=> + int(1000) +} + +Deprecated: MongoDB\Driver\ReadPreference::__construct(): Passing an integer mode to "MongoDB\Driver\ReadPreference::__construct" is deprecated and will be removed in a future release. in %s +object(MongoDB\Driver\ReadPreference)#%d (%d) { + ["mode"]=> + string(9) "secondary" + ["hedge"]=> + object(stdClass)#%d (%d) { + ["enabled"]=> + bool(true) + } +} + +Deprecated: MongoDB\Driver\ReadPreference::__construct(): Passing an integer mode to "MongoDB\Driver\ReadPreference::__construct" is deprecated and will be removed in a future release. in %s +object(MongoDB\Driver\ReadPreference)#%d (%d) { + ["mode"]=> + string(9) "secondary" +} +===DONE=== diff --git a/tests/readPreference/readpreference-ctor-004.phpt b/tests/readPreference/readpreference-ctor-004.phpt new file mode 100644 index 000000000..88d9ec754 --- /dev/null +++ b/tests/readPreference/readpreference-ctor-004.phpt @@ -0,0 +1,82 @@ +--TEST-- +MongoDB\Driver\ReadPreference construction with integer constants (PHP 8.3+) +--SKIPIF-- + + +--FILE-- + 'one']])); +var_dump(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY, [])); +var_dump(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY, null, ['maxStalenessSeconds' => 1000])); +var_dump(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY, null, ['hedge' => ['enabled' => true]])); +var_dump(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY, null, ['hedge' => []])); + +?> +===DONE=== + +--EXPECTF-- +Deprecated: Constant MongoDB\Driver\ReadPreference::RP_PRIMARY is deprecated in %s + +Deprecated: MongoDB\Driver\ReadPreference::__construct(): Passing an integer mode to "MongoDB\Driver\ReadPreference::__construct" is deprecated and will be removed in a future release. in %s +object(MongoDB\Driver\ReadPreference)#%d (%d) { + ["mode"]=> + string(7) "primary" +} + +Deprecated: Constant MongoDB\Driver\ReadPreference::RP_SECONDARY is deprecated in %s + +Deprecated: MongoDB\Driver\ReadPreference::__construct(): Passing an integer mode to "MongoDB\Driver\ReadPreference::__construct" is deprecated and will be removed in a future release. in %s +object(MongoDB\Driver\ReadPreference)#%d (%d) { + ["mode"]=> + string(9) "secondary" + ["tags"]=> + array(1) { + [0]=> + object(stdClass)#%d (%d) { + ["tag"]=> + string(3) "one" + } + } +} + +Deprecated: Constant MongoDB\Driver\ReadPreference::RP_PRIMARY is deprecated in %s + +Deprecated: MongoDB\Driver\ReadPreference::__construct(): Passing an integer mode to "MongoDB\Driver\ReadPreference::__construct" is deprecated and will be removed in a future release. in %s +object(MongoDB\Driver\ReadPreference)#%d (%d) { + ["mode"]=> + string(7) "primary" +} + +Deprecated: Constant MongoDB\Driver\ReadPreference::RP_SECONDARY is deprecated in %s + +Deprecated: MongoDB\Driver\ReadPreference::__construct(): Passing an integer mode to "MongoDB\Driver\ReadPreference::__construct" is deprecated and will be removed in a future release. in %s +object(MongoDB\Driver\ReadPreference)#%d (%d) { + ["mode"]=> + string(9) "secondary" + ["maxStalenessSeconds"]=> + int(1000) +} + +Deprecated: Constant MongoDB\Driver\ReadPreference::RP_SECONDARY is deprecated in %s + +Deprecated: MongoDB\Driver\ReadPreference::__construct(): Passing an integer mode to "MongoDB\Driver\ReadPreference::__construct" is deprecated and will be removed in a future release. in %s +object(MongoDB\Driver\ReadPreference)#%d (%d) { + ["mode"]=> + string(9) "secondary" + ["hedge"]=> + object(stdClass)#%d (%d) { + ["enabled"]=> + bool(true) + } +} + +Deprecated: Constant MongoDB\Driver\ReadPreference::RP_SECONDARY is deprecated in %s + +Deprecated: MongoDB\Driver\ReadPreference::__construct(): Passing an integer mode to "MongoDB\Driver\ReadPreference::__construct" is deprecated and will be removed in a future release. in %s +object(MongoDB\Driver\ReadPreference)#%d (%d) { + ["mode"]=> + string(9) "secondary" +} +===DONE=== diff --git a/tests/readPreference/readpreference-ctor_error-001.phpt b/tests/readPreference/readpreference-ctor_error-001.phpt index 08e153781..5a2f2d36a 100644 --- a/tests/readPreference/readpreference-ctor_error-001.phpt +++ b/tests/readPreference/readpreference-ctor_error-001.phpt @@ -6,7 +6,7 @@ MongoDB\Driver\ReadPreference construction (invalid mode) require_once __DIR__ . '/../utils/basic.inc'; echo throws(function() { - new MongoDB\Driver\ReadPreference(42); + new MongoDB\Driver\ReadPreference('foo'); }, 'MongoDB\Driver\Exception\InvalidArgumentException'), "\n"; ?> @@ -14,5 +14,5 @@ echo throws(function() { --EXPECT-- OK: Got MongoDB\Driver\Exception\InvalidArgumentException -Invalid mode: 42 +Invalid mode: 'foo' ===DONE=== diff --git a/tests/readPreference/readpreference-ctor_error-002.phpt b/tests/readPreference/readpreference-ctor_error-002.phpt index 6d91f3147..8bcd17cc7 100644 --- a/tests/readPreference/readpreference-ctor_error-002.phpt +++ b/tests/readPreference/readpreference-ctor_error-002.phpt @@ -6,7 +6,7 @@ MongoDB\Driver\ReadPreference construction (invalid tagSets) require_once __DIR__ . '/../utils/basic.inc'; echo throws(function() { - new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY, [['tag' => 'one']]); + new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::PRIMARY, [['tag' => 'one']]); }, 'MongoDB\Driver\Exception\InvalidArgumentException'), "\n"; echo throws(function() { @@ -14,16 +14,16 @@ echo throws(function() { }, 'MongoDB\Driver\Exception\InvalidArgumentException'), "\n"; echo throws(function() { - new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY, ['invalid']); + new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::PRIMARY, ['invalid']); }, 'MongoDB\Driver\Exception\InvalidArgumentException'), "\n"; echo throws(function() { - new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY, ['invalid']); + new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY, ['invalid']); }, 'MongoDB\Driver\Exception\InvalidArgumentException'), "\n"; // Ensure that tagSets is validated before maxStalenessSeconds option echo throws(function() { - new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY, ['invalid'], ['maxStalenessSeconds' => -2]); + new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY, ['invalid'], ['maxStalenessSeconds' => -2]); }, 'MongoDB\Driver\Exception\InvalidArgumentException'), "\n"; ?> diff --git a/tests/readPreference/readpreference-ctor_error-003.phpt b/tests/readPreference/readpreference-ctor_error-003.phpt index 934d5d3c4..ce9e9f6d8 100644 --- a/tests/readPreference/readpreference-ctor_error-003.phpt +++ b/tests/readPreference/readpreference-ctor_error-003.phpt @@ -6,7 +6,7 @@ MongoDB\Driver\ReadPreference construction (invalid maxStalenessSeconds) require_once __DIR__ . '/../utils/basic.inc'; echo throws(function() { - new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY, null, ['maxStalenessSeconds' => 1000]); + new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::PRIMARY, null, ['maxStalenessSeconds' => 1000]); }, 'MongoDB\Driver\Exception\InvalidArgumentException'), "\n"; echo throws(function() { @@ -14,15 +14,15 @@ echo throws(function() { }, 'MongoDB\Driver\Exception\InvalidArgumentException'), "\n"; echo throws(function() { - new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY, null, ['maxStalenessSeconds' => -2]); + new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY, null, ['maxStalenessSeconds' => -2]); }, 'MongoDB\Driver\Exception\InvalidArgumentException'), "\n"; echo throws(function() { - new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY, null, ['maxStalenessSeconds' => 0]); + new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY, null, ['maxStalenessSeconds' => 0]); }, 'MongoDB\Driver\Exception\InvalidArgumentException'), "\n"; echo throws(function() { - new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY, null, ['maxStalenessSeconds' => 42]); + new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY, null, ['maxStalenessSeconds' => 42]); }, 'MongoDB\Driver\Exception\InvalidArgumentException'), "\n"; ?> diff --git a/tests/readPreference/readpreference-ctor_error-004.phpt b/tests/readPreference/readpreference-ctor_error-004.phpt index 5c8a4372f..0ac9661b9 100644 --- a/tests/readPreference/readpreference-ctor_error-004.phpt +++ b/tests/readPreference/readpreference-ctor_error-004.phpt @@ -8,7 +8,7 @@ MongoDB\Driver\ReadPreference construction (invalid maxStalenessSeconds range) require_once __DIR__ . '/../utils/basic.inc'; echo throws(function() { - new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY, null, ['maxStalenessSeconds' => 2147483648]); + new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY, null, ['maxStalenessSeconds' => 2147483648]); }, 'MongoDB\Driver\Exception\InvalidArgumentException'), "\n"; ?> diff --git a/tests/readPreference/readpreference-ctor_error-007.phpt b/tests/readPreference/readpreference-ctor_error-007.phpt index 18bccfcd4..cd016c61f 100644 --- a/tests/readPreference/readpreference-ctor_error-007.phpt +++ b/tests/readPreference/readpreference-ctor_error-007.phpt @@ -6,7 +6,7 @@ MongoDB\Driver\ReadPreference construction (combining hedge with primary read pr require_once __DIR__ . '/../utils/basic.inc'; echo throws(function() { - new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY, null, ['hedge' => ['enabled' => true]]); + new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::PRIMARY, null, ['hedge' => ['enabled' => true]]); }, 'MongoDB\Driver\Exception\InvalidArgumentException'), "\n"; ?> diff --git a/tests/readPreference/readpreference-debug-001.phpt b/tests/readPreference/readpreference-debug-001.phpt index 18c0d4f25..56aa6e77a 100644 --- a/tests/readPreference/readpreference-debug-001.phpt +++ b/tests/readPreference/readpreference-debug-001.phpt @@ -6,16 +6,16 @@ MongoDB\Driver\ReadPreference debug output require_once __DIR__ . '/../utils/basic.inc'; $tests = [ - new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY), - new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY_PREFERRED), - new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY), - new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY_PREFERRED), - new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_NEAREST), - new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY, []), - new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY, [['dc' => 'ny']]), - new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY, [['dc' => 'ny'], ['dc' => 'sf', 'use' => 'reporting'], []]), - new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY, null, ['maxStalenessSeconds' => 1000]), - new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY, null, ['hedge' => ['enabled' => true]]), + new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::PRIMARY), + new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::PRIMARY_PREFERRED), + new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY), + new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY_PREFERRED), + new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::NEAREST), + new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::PRIMARY, []), + new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY, [['dc' => 'ny']]), + new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY, [['dc' => 'ny'], ['dc' => 'sf', 'use' => 'reporting'], []]), + new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY, null, ['maxStalenessSeconds' => 1000]), + new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY, null, ['hedge' => ['enabled' => true]]), ]; foreach ($tests as $test) { diff --git a/tests/readPreference/readpreference-getHedge-001.phpt b/tests/readPreference/readpreference-getHedge-001.phpt index 8415c8706..30415efd1 100644 --- a/tests/readPreference/readpreference-getHedge-001.phpt +++ b/tests/readPreference/readpreference-getHedge-001.phpt @@ -13,7 +13,7 @@ $tests = [ ]; foreach ($tests as $test) { - $rp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY, null, ['hedge' => $test]); + $rp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY, null, ['hedge' => $test]); var_dump($rp->getHedge()); } diff --git a/tests/readPreference/readpreference-getMaxStalenessMS-001.phpt b/tests/readPreference/readpreference-getMaxStalenessMS-001.phpt index db002eb28..07ee732e6 100644 --- a/tests/readPreference/readpreference-getMaxStalenessMS-001.phpt +++ b/tests/readPreference/readpreference-getMaxStalenessMS-001.phpt @@ -14,7 +14,7 @@ $tests = [ ]; foreach ($tests as $test) { - $rp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY, null, ['maxStalenessSeconds' => $test]); + $rp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY, null, ['maxStalenessSeconds' => $test]); var_dump($rp->getMaxStalenessSeconds()); } diff --git a/tests/readPreference/readpreference-getMode-001.phpt b/tests/readPreference/readpreference-getMode-001.phpt index ef31511e6..b62a13673 100644 --- a/tests/readPreference/readpreference-getMode-001.phpt +++ b/tests/readPreference/readpreference-getMode-001.phpt @@ -4,11 +4,11 @@ MongoDB\Driver\ReadPreference::getMode() ===DONE=== ---EXPECT-- +--EXPECTF-- +Deprecated: %s MongoDB\Driver\ReadPreference::getMode() is deprecated in %s int(1) + +Deprecated: %s MongoDB\Driver\ReadPreference::getMode() is deprecated in %s int(5) + +Deprecated: %s MongoDB\Driver\ReadPreference::getMode() is deprecated in %s int(2) + +Deprecated: %s MongoDB\Driver\ReadPreference::getMode() is deprecated in %s int(6) + +Deprecated: %s MongoDB\Driver\ReadPreference::getMode() is deprecated in %s int(10) ===DONE=== diff --git a/tests/readPreference/readpreference-getModeString-001.phpt b/tests/readPreference/readpreference-getModeString-001.phpt index b9e23d094..918e81d2e 100644 --- a/tests/readPreference/readpreference-getModeString-001.phpt +++ b/tests/readPreference/readpreference-getModeString-001.phpt @@ -4,11 +4,11 @@ MongoDB\Driver\ReadPreference::getModeString() getTagSets()); } diff --git a/tests/readPreference/readpreference-serialization-002.phpt b/tests/readPreference/readpreference-serialization-002.phpt index f08da8dc4..8b275abbd 100644 --- a/tests/readPreference/readpreference-serialization-002.phpt +++ b/tests/readPreference/readpreference-serialization-002.phpt @@ -6,16 +6,16 @@ MongoDB\Driver\ReadPreference serialization (__serialize and __unserialize) require_once __DIR__ . '/../utils/basic.inc'; $tests = [ - new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY), - new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY_PREFERRED), - new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY), - new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY_PREFERRED), - new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_NEAREST), - new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY, []), - new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY, [['dc' => 'ny']]), - new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY, [['dc' => 'ny'], ['dc' => 'sf', 'use' => 'reporting'], []]), - new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY, null, ['maxStalenessSeconds' => 1000]), - new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY, null, ['hedge' => ['enabled' => true]]), + new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::PRIMARY), + new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::PRIMARY_PREFERRED), + new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY), + new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY_PREFERRED), + new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::NEAREST), + new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY, []), + new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY, [['dc' => 'ny']]), + new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY, [['dc' => 'ny'], ['dc' => 'sf', 'use' => 'reporting'], []]), + new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY, null, ['maxStalenessSeconds' => 1000]), + new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY, null, ['hedge' => ['enabled' => true]]), ]; foreach ($tests as $test) { diff --git a/tests/readPreference/readpreference-var_export-001.phpt b/tests/readPreference/readpreference-var_export-001.phpt index f26425256..785e6b3b3 100644 --- a/tests/readPreference/readpreference-var_export-001.phpt +++ b/tests/readPreference/readpreference-var_export-001.phpt @@ -6,15 +6,15 @@ MongoDB\Driver\ReadPreference: var_export() require_once __DIR__ . '/../utils/basic.inc'; $tests = [ - new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY), - new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY_PREFERRED), - new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY), - new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY_PREFERRED), - new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_NEAREST), - new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY, []), - new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY, [['dc' => 'ny']]), - new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY, [['dc' => 'ny'], ['dc' => 'sf', 'use' => 'reporting'], []]), - new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY, null, ['maxStalenessSeconds' => 1000]), + new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::PRIMARY), + new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::PRIMARY_PREFERRED), + new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY), + new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY_PREFERRED), + new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::NEAREST), + new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::PRIMARY, []), + new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY, [['dc' => 'ny']]), + new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY, [['dc' => 'ny'], ['dc' => 'sf', 'use' => 'reporting'], []]), + new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY, null, ['maxStalenessSeconds' => 1000]), ]; foreach ($tests as $test) { diff --git a/tests/replicaset/manager-selectserver-001.phpt b/tests/replicaset/manager-selectserver-001.phpt index 1a0f65d9e..997bccf65 100644 --- a/tests/replicaset/manager-selectserver-001.phpt +++ b/tests/replicaset/manager-selectserver-001.phpt @@ -13,9 +13,9 @@ require_once __DIR__ . "/../utils/basic.inc"; // Explicitly use w:1 to work around MongoDB 5.0 applying w:majority (SERVER-61790) $manager = create_test_manager(URI, ['retryWrites' => false, 'w' => 1]); -$rp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY); +$rp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::PRIMARY); $server = $manager->selectServer($rp); -$rp2 = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY); +$rp2 = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::PRIMARY); $server2 = $manager->selectServer($rp2); // load fixtures for test diff --git a/tests/replicaset/writeresult-getserver-001.phpt b/tests/replicaset/writeresult-getserver-001.phpt index ec1dccf43..93db60e4a 100644 --- a/tests/replicaset/writeresult-getserver-001.phpt +++ b/tests/replicaset/writeresult-getserver-001.phpt @@ -28,7 +28,7 @@ $server2 = $server->executeBulkWrite(NS, $bulk)->getServer(); var_dump($server == $server2); -$rp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY); +$rp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY); /* Fetch a secondary */ $server3 = $manager->executeQuery(NS, new MongoDB\Driver\Query(array()), $rp)->getServer(); diff --git a/tests/replicaset/writeresult-getserver-002.phpt b/tests/replicaset/writeresult-getserver-002.phpt index e78b88447..562de0a97 100644 --- a/tests/replicaset/writeresult-getserver-002.phpt +++ b/tests/replicaset/writeresult-getserver-002.phpt @@ -31,7 +31,7 @@ $server2 = $server->executeBulkWrite(NS, $bulk)->getServer(); var_dump($server == $server2); -$rp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY); +$rp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY); /* Fetch a secondary */ $server3 = $manager->executeQuery(NS, new MongoDB\Driver\Query(array()), $rp)->getServer(); diff --git a/tests/server/bug0671-002.phpt b/tests/server/bug0671-002.phpt index 6498c4415..e0238e4af 100644 --- a/tests/server/bug0671-002.phpt +++ b/tests/server/bug0671-002.phpt @@ -9,7 +9,7 @@ PHPC-671: Segfault if Manager is already freed when using selected Server require_once __DIR__ . "/../utils/basic.inc"; $manager = create_test_manager(); -$server = $manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY)); +$server = $manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::PRIMARY)); unset($manager); diff --git a/tests/server/server-executeBulkWrite-002.phpt b/tests/server/server-executeBulkWrite-002.phpt index dab23c6ef..02ea0770e 100644 --- a/tests/server/server-executeBulkWrite-002.phpt +++ b/tests/server/server-executeBulkWrite-002.phpt @@ -9,7 +9,7 @@ MongoDB\Driver\Server::executeBulkWrite() with write concern (standalone) require_once __DIR__ . "/../utils/basic.inc"; $manager = create_test_manager(); -$primary = $manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY)); +$primary = $manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::PRIMARY)); $writeConcerns = array(0, 1); diff --git a/tests/server/server-executeBulkWrite-003.phpt b/tests/server/server-executeBulkWrite-003.phpt index 4f28e900c..a31074f85 100644 --- a/tests/server/server-executeBulkWrite-003.phpt +++ b/tests/server/server-executeBulkWrite-003.phpt @@ -10,7 +10,7 @@ MongoDB\Driver\Server::executeBulkWrite() with legacy write concern (replica set require_once __DIR__ . "/../utils/basic.inc"; $manager = create_test_manager(); -$server = $manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY)); +$server = $manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::PRIMARY)); $writeConcerns = array(0, 1, 2, MongoDB\Driver\WriteConcern::MAJORITY); diff --git a/tests/server/server-executeBulkWrite-004.phpt b/tests/server/server-executeBulkWrite-004.phpt index a5a061a50..d4398bdc1 100644 --- a/tests/server/server-executeBulkWrite-004.phpt +++ b/tests/server/server-executeBulkWrite-004.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . "/../utils/basic.inc"; /* Disable retryWrites since the test expects to receive a "not primary" error, * which retryable writes would otherwise use to retry against the primary. */ $manager = create_test_manager(URI, ['retryWrites' => false]); -$server = $manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY)); +$server = $manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY)); $writeConcerns = array(1, 2, MongoDB\Driver\WriteConcern::MAJORITY); diff --git a/tests/server/server-executeBulkWrite-005.phpt b/tests/server/server-executeBulkWrite-005.phpt index d20ff303d..3a954dbf4 100644 --- a/tests/server/server-executeBulkWrite-005.phpt +++ b/tests/server/server-executeBulkWrite-005.phpt @@ -13,7 +13,7 @@ require_once __DIR__ . "/../utils/basic.inc"; // Disable retryWrites since the test writes to the unreplicated "local" database // Explicitly use w:1 to work around MongoDB 5.0 applying w:majority (SERVER-61790) $manager = create_test_manager(URI, ['retryWrites' => false, 'w' => 1]); -$server = $manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY)); +$server = $manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY)); /* The server ignores write concerns with w>2 for writes to the local database, * so we won't test behavior for w=2 and w=majority. */ diff --git a/tests/server/server-executeBulkWrite-006.phpt b/tests/server/server-executeBulkWrite-006.phpt index 2639f2422..7e665825f 100644 --- a/tests/server/server-executeBulkWrite-006.phpt +++ b/tests/server/server-executeBulkWrite-006.phpt @@ -10,7 +10,7 @@ MongoDB\Driver\Server::executeBulkWrite() with legacy write concern (replica set require_once __DIR__ . "/../utils/basic.inc"; $manager = create_test_manager(); -$server = $manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY)); +$server = $manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::PRIMARY)); $writeConcerns = [0, 1, 2, MongoDB\Driver\WriteConcern::MAJORITY]; diff --git a/tests/server/server-executeBulkWrite-007.phpt b/tests/server/server-executeBulkWrite-007.phpt index 0b9ccb87d..a2117777f 100644 --- a/tests/server/server-executeBulkWrite-007.phpt +++ b/tests/server/server-executeBulkWrite-007.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . "/../utils/basic.inc"; /* Disable retryWrites since the test expects to receive a "not primary" error, * which retryable writes would otherwise use to retry against the primary. */ $manager = create_test_manager(URI, ['retryWrites' => false]); -$server = $manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY)); +$server = $manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY)); $writeConcerns = [1, 2, MongoDB\Driver\WriteConcern::MAJORITY]; diff --git a/tests/server/server-executeBulkWrite_error-001.phpt b/tests/server/server-executeBulkWrite_error-001.phpt index 884c1436c..cb498af81 100644 --- a/tests/server/server-executeBulkWrite_error-001.phpt +++ b/tests/server/server-executeBulkWrite_error-001.phpt @@ -9,7 +9,7 @@ MongoDB\Driver\Server::executeBulkWrite() with empty BulkWrite require_once __DIR__ . "/../utils/basic.inc"; $manager = create_test_manager(); -$server = $manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY)); +$server = $manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::PRIMARY)); echo throws(function() use ($server) { $server->executeBulkWrite(NS, new MongoDB\Driver\BulkWrite); diff --git a/tests/server/server-executeBulkWrite_error-002.phpt b/tests/server/server-executeBulkWrite_error-002.phpt index 91c0724f6..50cea7e48 100644 --- a/tests/server/server-executeBulkWrite_error-002.phpt +++ b/tests/server/server-executeBulkWrite_error-002.phpt @@ -8,7 +8,7 @@ MongoDB\Driver\Server::executeBulkWrite() with invalid options require_once __DIR__ . "/../utils/basic.inc"; $manager = create_test_manager(); -$server = $manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY)); +$server = $manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::PRIMARY)); echo throws(function() use ($server) { $bulk = new MongoDB\Driver\BulkWrite(); diff --git a/tests/server/server-executeCommand-002.phpt b/tests/server/server-executeCommand-002.phpt index ae444c297..065c3a88d 100644 --- a/tests/server/server-executeCommand-002.phpt +++ b/tests/server/server-executeCommand-002.phpt @@ -11,7 +11,7 @@ require_once __DIR__ . "/../utils/basic.inc"; $manager = create_test_manager(); -$rp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY); +$rp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY); $secondary = $manager->selectServer($rp); $command = new MongoDB\Driver\Command(array('profile' => 2)); diff --git a/tests/server/server-executeCommand-003.phpt b/tests/server/server-executeCommand-003.phpt index a2e9ec6b9..36b0dde74 100644 --- a/tests/server/server-executeCommand-003.phpt +++ b/tests/server/server-executeCommand-003.phpt @@ -10,13 +10,13 @@ require_once __DIR__ . "/../utils/basic.inc"; $manager = create_test_manager(); -$secondaryRp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY); +$secondaryRp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY); $secondary = $manager->selectServer($secondaryRp); /* Note: this is testing that the read preference (even a conflicting one) has * no effect when directly querying a server, since the secondaryOk flag is always * set for hinted commands. */ -$primaryRp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY); +$primaryRp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::PRIMARY); $cursor = $secondary->executeCommand(DATABASE_NAME, new MongoDB\Driver\Command(array('ping' => 1)), $primaryRp); var_dump($cursor->toArray()); diff --git a/tests/server/server-executeCommand-004.phpt b/tests/server/server-executeCommand-004.phpt index 929453a7b..f4a219cbc 100644 --- a/tests/server/server-executeCommand-004.phpt +++ b/tests/server/server-executeCommand-004.phpt @@ -11,8 +11,8 @@ require_once __DIR__ . "/../utils/basic.inc"; $manager = create_test_manager(); -$primaryRp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY); -$secondaryRp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY); +$primaryRp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::PRIMARY); +$secondaryRp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY); $primary = $manager->selectServer($primaryRp); $secondary = $manager->selectServer($secondaryRp); diff --git a/tests/server/server-executeCommand-005.phpt b/tests/server/server-executeCommand-005.phpt index 17d792347..20cca0c58 100644 --- a/tests/server/server-executeCommand-005.phpt +++ b/tests/server/server-executeCommand-005.phpt @@ -11,8 +11,8 @@ require_once __DIR__ . "/../utils/basic.inc"; $manager = create_test_manager(); -$primaryRp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY); -$secondaryRp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY); +$primaryRp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::PRIMARY); +$secondaryRp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY); $primary = $manager->selectServer($primaryRp); $secondary = $manager->selectServer($secondaryRp); diff --git a/tests/server/server-executeCommand-006.phpt b/tests/server/server-executeCommand-006.phpt index afed4e4f2..269e8ef31 100644 --- a/tests/server/server-executeCommand-006.phpt +++ b/tests/server/server-executeCommand-006.phpt @@ -11,7 +11,7 @@ require_once __DIR__ . "/../utils/basic.inc"; require_once __DIR__ . "/../utils/observer.php"; $manager = create_test_manager(); -$server = $manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY)); +$server = $manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::PRIMARY)); (new CommandObserver)->observe( function() use ($server) { @@ -24,7 +24,7 @@ $server = $manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Drive DATABASE_NAME, $command, [ - 'readPreference' => new \MongoDB\Driver\ReadPreference(\MongoDB\Driver\ReadPreference::RP_SECONDARY), + 'readPreference' => new \MongoDB\Driver\ReadPreference(\MongoDB\Driver\ReadPreference::SECONDARY), 'readConcern' => new \MongoDB\Driver\ReadConcern(\MongoDB\Driver\ReadConcern::LOCAL), 'writeConcern' => new \MongoDB\Driver\WriteConcern(\MongoDB\Driver\WriteConcern::MAJORITY), ] diff --git a/tests/server/server-executeCommand-007.phpt b/tests/server/server-executeCommand-007.phpt index 51fd17aed..8f46479d1 100644 --- a/tests/server/server-executeCommand-007.phpt +++ b/tests/server/server-executeCommand-007.phpt @@ -9,7 +9,7 @@ require_once __DIR__ . "/../utils/basic.inc"; require_once __DIR__ . "/../utils/observer.php"; $manager = create_test_manager(); -$server = $manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY)); +$server = $manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::PRIMARY)); (new CommandObserver)->observe( function() use ($server) { @@ -17,7 +17,7 @@ $server = $manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Drive DATABASE_NAME, new MongoDB\Driver\Command(['ping' => true]), [ - 'readPreference' => new \MongoDB\Driver\ReadPreference(\MongoDB\Driver\ReadPreference::RP_NEAREST), + 'readPreference' => new \MongoDB\Driver\ReadPreference(\MongoDB\Driver\ReadPreference::NEAREST), ] ); }, diff --git a/tests/server/server-executeCommand-008.phpt b/tests/server/server-executeCommand-008.phpt index b72c99618..c289bfe6d 100644 --- a/tests/server/server-executeCommand-008.phpt +++ b/tests/server/server-executeCommand-008.phpt @@ -11,7 +11,7 @@ require_once __DIR__ . "/../utils/basic.inc"; require_once __DIR__ . "/../utils/observer.php"; $manager = create_test_manager(); -$server = $manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY)); +$server = $manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::PRIMARY)); (new CommandObserver)->observe( function() use ($server) { @@ -24,7 +24,7 @@ $server = $manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Drive DATABASE_NAME, $command, [ - 'readPreference' => new \MongoDB\Driver\ReadPreference(\MongoDB\Driver\ReadPreference::RP_SECONDARY), + 'readPreference' => new \MongoDB\Driver\ReadPreference(\MongoDB\Driver\ReadPreference::SECONDARY), 'readConcern' => new \MongoDB\Driver\ReadConcern(\MongoDB\Driver\ReadConcern::LOCAL), 'writeConcern' => new \MongoDB\Driver\WriteConcern(\MongoDB\Driver\WriteConcern::MAJORITY), ] diff --git a/tests/server/server-executeCommand_error-001.phpt b/tests/server/server-executeCommand_error-001.phpt index b9f3cadfd..0b6df9002 100644 --- a/tests/server/server-executeCommand_error-001.phpt +++ b/tests/server/server-executeCommand_error-001.phpt @@ -8,7 +8,7 @@ MongoDB\Driver\Server::executeCommand() with invalid options (MONGOC_CMD_RAW) require_once __DIR__ . "/../utils/basic.inc"; $manager = create_test_manager(); -$server = $manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY)); +$server = $manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::PRIMARY)); $command = new MongoDB\Driver\Command(['ping' => 1]); diff --git a/tests/server/server-executeQuery-006.phpt b/tests/server/server-executeQuery-006.phpt index 73ebfa8ae..90a714b26 100644 --- a/tests/server/server-executeQuery-006.phpt +++ b/tests/server/server-executeQuery-006.phpt @@ -11,7 +11,7 @@ require_once __DIR__ . "/../utils/basic.inc"; $manager = create_test_manager(); -$rp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY); +$rp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY); $secondary = $manager->selectServer($rp); $command = new MongoDB\Driver\Command(array('profile' => 2)); diff --git a/tests/server/server-executeQuery-008.phpt b/tests/server/server-executeQuery-008.phpt index 2c3090a3b..9d2f915ac 100644 --- a/tests/server/server-executeQuery-008.phpt +++ b/tests/server/server-executeQuery-008.phpt @@ -11,7 +11,7 @@ require_once __DIR__ . "/../utils/basic.inc"; $manager = create_test_manager(); -$primaryRp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY); +$primaryRp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::PRIMARY); $primary = $manager->selectServer($primaryRp); // Count all data-bearing members to use for the write concern @@ -23,7 +23,7 @@ $bulk = new \MongoDB\Driver\BulkWrite; $bulk->insert(['_id' => 1, 'x' => 1]); $primary->executeBulkWrite(NS, $bulk, new MongoDB\Driver\WriteConcern($dataBearingNodes)); -$secondaryRp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY); +$secondaryRp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY); $secondary = $manager->selectServer($secondaryRp); /* Note: this is testing that the read preference (even a conflicting one) has diff --git a/tests/server/server-executeQuery-009.phpt b/tests/server/server-executeQuery-009.phpt index 2062c2cd4..2c15a0af9 100644 --- a/tests/server/server-executeQuery-009.phpt +++ b/tests/server/server-executeQuery-009.phpt @@ -16,8 +16,8 @@ $bulk = new MongoDB\Driver\BulkWrite(); $bulk->insert(['_id' => 1, 'x' => 2, 'y' => 3]); $manager->executeBulkWrite(NS, $bulk); -$primaryRp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY); -$secondaryRp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY); +$primaryRp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::PRIMARY); +$secondaryRp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY); $primary = $manager->selectServer($primaryRp); $secondary = $manager->selectServer($secondaryRp); diff --git a/tests/server/server-executeQuery-010.phpt b/tests/server/server-executeQuery-010.phpt index fde19aac3..1a85b4bf4 100644 --- a/tests/server/server-executeQuery-010.phpt +++ b/tests/server/server-executeQuery-010.phpt @@ -16,8 +16,8 @@ $bulk = new MongoDB\Driver\BulkWrite(); $bulk->insert(['_id' => 1, 'x' => 2, 'y' => 3]); $manager->executeBulkWrite(NS, $bulk); -$primaryRp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY); -$secondaryRp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY); +$primaryRp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::PRIMARY); +$secondaryRp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY); $primary = $manager->selectServer($primaryRp); $secondary = $manager->selectServer($secondaryRp); diff --git a/tests/server/server-executeQuery-011.phpt b/tests/server/server-executeQuery-011.phpt index d2dcc1e1a..a75d3ffe2 100644 --- a/tests/server/server-executeQuery-011.phpt +++ b/tests/server/server-executeQuery-011.phpt @@ -9,7 +9,7 @@ require_once __DIR__ . "/../utils/basic.inc"; require_once __DIR__ . "/../utils/observer.php"; $manager = create_test_manager(); -$server = $manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY)); +$server = $manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::PRIMARY)); (new CommandObserver)->observe( function() use ($server) { @@ -17,7 +17,7 @@ $server = $manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Drive NS, new MongoDB\Driver\Query(['x' => 1]), [ - 'readPreference' => new \MongoDB\Driver\ReadPreference(\MongoDB\Driver\ReadPreference::RP_NEAREST), + 'readPreference' => new \MongoDB\Driver\ReadPreference(\MongoDB\Driver\ReadPreference::NEAREST), ] ); }, diff --git a/tests/server/server-executeQuery_error-001.phpt b/tests/server/server-executeQuery_error-001.phpt index 14d400fd1..57354451d 100644 --- a/tests/server/server-executeQuery_error-001.phpt +++ b/tests/server/server-executeQuery_error-001.phpt @@ -8,7 +8,7 @@ MongoDB\Driver\Server::executeQuery() with invalid options require_once __DIR__ . "/../utils/basic.inc"; $manager = create_test_manager(); -$server = $manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY)); +$server = $manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::PRIMARY)); $query = new MongoDB\Driver\Query(['x' => 3], ['projection' => ['y' => 1]]); diff --git a/tests/server/server-executeReadCommand-001.phpt b/tests/server/server-executeReadCommand-001.phpt index b673e3911..7065d8ce1 100644 --- a/tests/server/server-executeReadCommand-001.phpt +++ b/tests/server/server-executeReadCommand-001.phpt @@ -13,7 +13,7 @@ require_once __DIR__ . "/../utils/basic.inc"; require_once __DIR__ . "/../utils/observer.php"; $manager = create_test_manager(); -$server = $manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY)); +$server = $manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY)); (new CommandObserver)->observe( function() use ($server) { @@ -26,7 +26,7 @@ $server = $manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Drive DATABASE_NAME, $command, [ - 'readPreference' => new \MongoDB\Driver\ReadPreference(\MongoDB\Driver\ReadPreference::RP_SECONDARY), + 'readPreference' => new \MongoDB\Driver\ReadPreference(\MongoDB\Driver\ReadPreference::SECONDARY), 'readConcern' => new \MongoDB\Driver\ReadConcern(\MongoDB\Driver\ReadConcern::MAJORITY), ] ); diff --git a/tests/server/server-executeReadCommand_error-001.phpt b/tests/server/server-executeReadCommand_error-001.phpt index 4a0c6b641..eac487e32 100644 --- a/tests/server/server-executeReadCommand_error-001.phpt +++ b/tests/server/server-executeReadCommand_error-001.phpt @@ -11,7 +11,7 @@ MongoDB\Driver\Server::executeReadCommand() with invalid options require_once __DIR__ . "/../utils/basic.inc"; $manager = create_test_manager(); -$server = $manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY)); +$server = $manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY)); $command = new MongoDB\Driver\Command(['ping' => 1]); diff --git a/tests/server/server-executeReadWriteCommand-001.phpt b/tests/server/server-executeReadWriteCommand-001.phpt index 9b3b6a962..e12daea02 100644 --- a/tests/server/server-executeReadWriteCommand-001.phpt +++ b/tests/server/server-executeReadWriteCommand-001.phpt @@ -10,7 +10,7 @@ require_once __DIR__ . "/../utils/basic.inc"; require_once __DIR__ . "/../utils/observer.php"; $manager = create_test_manager(); -$server = $manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY)); +$server = $manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::PRIMARY)); (new CommandObserver)->observe( function() use ($server) { diff --git a/tests/server/server-executeReadWriteCommand_error-001.phpt b/tests/server/server-executeReadWriteCommand_error-001.phpt index 28548a24c..5e44098ce 100644 --- a/tests/server/server-executeReadWriteCommand_error-001.phpt +++ b/tests/server/server-executeReadWriteCommand_error-001.phpt @@ -11,7 +11,7 @@ MongoDB\Driver\Server::executeReadWriteCommand() with invalid options require_once __DIR__ . "/../utils/basic.inc"; $manager = create_test_manager(); -$server = $manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY)); +$server = $manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY)); $command = new MongoDB\Driver\Command(['ping' => 1]); diff --git a/tests/server/server-executeWriteCommand-001.phpt b/tests/server/server-executeWriteCommand-001.phpt index 44c34e544..9a7e47434 100644 --- a/tests/server/server-executeWriteCommand-001.phpt +++ b/tests/server/server-executeWriteCommand-001.phpt @@ -10,7 +10,7 @@ require_once __DIR__ . "/../utils/basic.inc"; require_once __DIR__ . "/../utils/observer.php"; $manager = create_test_manager(); -$server = $manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY)); +$server = $manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::PRIMARY)); $bw = new MongoDB\Driver\BulkWrite(); $bw->insert(['a' => 1]); diff --git a/tests/server/server-executeWriteCommand_error-001.phpt b/tests/server/server-executeWriteCommand_error-001.phpt index 9443768ad..a73f5037d 100644 --- a/tests/server/server-executeWriteCommand_error-001.phpt +++ b/tests/server/server-executeWriteCommand_error-001.phpt @@ -12,7 +12,7 @@ require_once __DIR__ . "/../utils/basic.inc"; require_once __DIR__ . "/../utils/observer.php"; $manager = create_test_manager(); -$server = $manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY)); +$server = $manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::SECONDARY)); $command = new MongoDB\Driver\Command([]); diff --git a/tests/server/server-getInfo-001.phpt b/tests/server/server-getInfo-001.phpt index a4d7c516d..779d30a96 100644 --- a/tests/server/server-getInfo-001.phpt +++ b/tests/server/server-getInfo-001.phpt @@ -10,7 +10,7 @@ require_once __DIR__ . "/../utils/basic.inc"; $manager = create_test_manager(); try{ -var_dump($manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY))->getInfo()); +var_dump($manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::PRIMARY))->getInfo()); } catch (Exception $e) {} ?> ===DONE=== diff --git a/tests/server/server-getTags-001.phpt b/tests/server/server-getTags-001.phpt index 51947682e..5a4db60d9 100644 --- a/tests/server/server-getTags-001.phpt +++ b/tests/server/server-getTags-001.phpt @@ -11,7 +11,7 @@ require_once __DIR__ . "/../utils/basic.inc"; $manager = create_test_manager(); -var_dump($manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY))->getTags()); +var_dump($manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::PRIMARY))->getTags()); ?> ===DONE=== diff --git a/tests/session/session-startTransaction_error-002.phpt b/tests/session/session-startTransaction_error-002.phpt index c89f72a0c..b841e584f 100644 --- a/tests/session/session-startTransaction_error-002.phpt +++ b/tests/session/session-startTransaction_error-002.phpt @@ -21,7 +21,7 @@ $options = [ [ 'readPreference' => new \MongoDB\Driver\ReadConcern( \MongoDB\Driver\ReadConcern::LOCAL ) ], [ 'writeConcern' => 42 ], [ 'writeConcern' => new stdClass ], - [ 'writeConcern' => new \MongoDB\Driver\ReadPreference( \MongoDB\Driver\ReadPreference::RP_SECONDARY ) ], + [ 'writeConcern' => new \MongoDB\Driver\ReadPreference( \MongoDB\Driver\ReadPreference::SECONDARY ) ], [ 'readConcern' => new \MongoDB\Driver\ReadConcern( \MongoDB\Driver\ReadConcern::LOCAL ), @@ -29,11 +29,11 @@ $options = [ ], [ 'readConcern' => new \MongoDB\Driver\ReadConcern( \MongoDB\Driver\ReadConcern::LOCAL ), - 'writeConcern' => new \MongoDB\Driver\ReadPreference( \MongoDB\Driver\ReadPreference::RP_SECONDARY ), + 'writeConcern' => new \MongoDB\Driver\ReadPreference( \MongoDB\Driver\ReadPreference::SECONDARY ), ], [ - 'readPreference' => new \MongoDB\Driver\ReadPreference( \MongoDB\Driver\ReadPreference::RP_SECONDARY ), - 'writeConcern' => new \MongoDB\Driver\ReadPreference( \MongoDB\Driver\ReadPreference::RP_SECONDARY ), + 'readPreference' => new \MongoDB\Driver\ReadPreference( \MongoDB\Driver\ReadPreference::SECONDARY ), + 'writeConcern' => new \MongoDB\Driver\ReadPreference( \MongoDB\Driver\ReadPreference::SECONDARY ), ], ]; diff --git a/tests/standalone/manager-as-singleton.phpt b/tests/standalone/manager-as-singleton.phpt index 069bdd3c7..4cdd333de 100644 --- a/tests/standalone/manager-as-singleton.phpt +++ b/tests/standalone/manager-as-singleton.phpt @@ -30,7 +30,7 @@ class Database { } public function query($scheme, $query) { - return $this->Database->executeQuery($scheme, $query, new ReadPreference(ReadPreference::RP_PRIMARY)); + return $this->Database->executeQuery($scheme, $query, new ReadPreference(ReadPreference::PRIMARY)); } } diff --git a/tests/utils/skipif.php b/tests/utils/skipif.php index 2efd31f3d..e7ba4d242 100644 --- a/tests/utils/skipif.php +++ b/tests/utils/skipif.php @@ -494,10 +494,3 @@ function skip_if_no_crypt_shared() exit('skip crypt_shared is not available'); } } - -function skip_if_no_atlas_connectivity_urls() -{ - if (getAtlasConnectivityUrls() === []) { - exit('skip No Atlas URIs found'); - } -} diff --git a/tests/utils/tools.php b/tests/utils/tools.php index d0753b900..07142cc32 100644 --- a/tests/utils/tools.php +++ b/tests/utils/tools.php @@ -92,7 +92,7 @@ function get_module_info($row) return $matches[1]; } -function create_test_manager(string $uri = null, array $options = [], array $driverOptions = []) +function create_test_manager(?string $uri = null, array $options = [], array $driverOptions = []) { if (getenv('API_VERSION') && ! isset($driverOptions['serverApi'])) { $driverOptions['serverApi'] = new ServerApi(getenv('API_VERSION')); @@ -517,7 +517,7 @@ function loadFixtures(Manager $manager, $dbname = DATABASE_NAME, $collname = COL $bulk = new BulkWrite(['ordered' => false]); - $server = $manager->selectServer(new ReadPreference(ReadPreference::RP_PRIMARY)); + $server = $manager->selectServer(new ReadPreference(ReadPreference::PRIMARY)); $data = file_get_contents($filename); $array = json_decode($data); @@ -628,7 +628,7 @@ function severityToString(int $severity): string { * from a particular function. Returns the message from the raised error or * exception, or an empty string if neither was thrown. */ -function raises(callable $callable, int $expectedSeverity, string $expectedFromFunction = null): string +function raises(callable $callable, int $expectedSeverity, ?string $expectedFromFunction = null): string { set_error_handler(function(int $severity, string $message, string $file, int $line) { throw new ErrorException($message, 0, $severity, $file, $line); @@ -672,7 +672,7 @@ function raises(callable $callable, int $expectedSeverity, string $expectedFromF * the exception to be thrown from a particular function. Returns the message * from the thrown exception, or an empty string if one was not thrown. */ -function throws(callable $callable, string $expectedException, string $expectedFromFunction = null): string +function throws(callable $callable, string $expectedException, ?string $expectedFromFunction = null): string { try { call_user_func($callable); @@ -730,7 +730,7 @@ function printWriteResult(WriteResult $result, $details = true) } } -function printWriteConcernError(WriteConcernError $error = null, $details) +function printWriteConcernError(?WriteConcernError $error = null, $details = null) { if ($error) { /* This stuff is generated by the server, no need for us to test it */ @@ -809,22 +809,22 @@ function failMaxTimeMS(Server $server) } function toPHP($var, $typemap = array()) { - return MongoDB\BSON\toPHP($var, $typemap); + return MongoDB\BSON\Document::fromBSON($var)->toPHP($typemap); } function fromPHP($var) { - return MongoDB\BSON\fromPHP($var); + return (string) MongoDB\BSON\Document::fromPHP($var); } function toJSON($var) { - return MongoDB\BSON\toJSON($var); + return MongoDB\BSON\Document::fromBSON($var)->toCanonicalExtendedJSON(); } function toCanonicalExtendedJSON($var) { - return MongoDB\BSON\toCanonicalExtendedJSON($var); + return MongoDB\BSON\Document::fromBSON($var)->toCanonicalExtendedJSON(); } function toRelaxedExtendedJSON($var) { - return MongoDB\BSON\toRelaxedExtendedJSON($var); + return MongoDB\BSON\Document::fromBSON($var)->toRelaxedExtendedJSON(); } function fromJSON($var) { - return MongoDB\BSON\fromJSON($var); + return (string) MongoDB\BSON\Document::fromJSON($var); } /* Note: this fail point may terminate the mongod process, so you may want to @@ -847,26 +847,3 @@ function failGetMore(Manager $manager) throw new Exception("Trying to configure a getMore fail point for a server version ($version) that doesn't support it"); } - -function getAtlasConnectivityUrls(): array -{ - $atlasUriString = getenv('ATLAS_CONNECTIVITY_URIS') ?: ''; - if (!$atlasUriString) { - return []; - } - - $rawUrls = explode("\n", $atlasUriString); - - $urls = []; - foreach ($rawUrls as $url) { - $url = trim($url); - - if ($url == '') { - continue; - } - - $urls[] = $url; - } - - return $urls; -} diff --git a/tests/writeConcern/writeconcern-bsonserialize-001.phpt b/tests/writeConcern/writeconcern-bsonserialize-001.phpt index 88542816e..4aa00f78c 100644 --- a/tests/writeConcern/writeconcern-bsonserialize-001.phpt +++ b/tests/writeConcern/writeconcern-bsonserialize-001.phpt @@ -32,15 +32,15 @@ foreach ($tests as $test) { --EXPECT-- { "w" : "majority" } { } -{ "w" : -1 } -{ "w" : 0 } -{ "w" : 1 } +{ "w" : { "$numberInt" : "-1" } } +{ "w" : { "$numberInt" : "0" } } +{ "w" : { "$numberInt" : "1" } } { "w" : "majority" } { "w" : "tag" } -{ "w" : 1 } -{ "w" : 1, "j" : false } -{ "w" : 1, "wtimeout" : 1000 } -{ "w" : 1, "j" : true, "wtimeout" : 1000 } +{ "w" : { "$numberInt" : "1" } } +{ "w" : { "$numberInt" : "1" }, "j" : false } +{ "w" : { "$numberInt" : "1" }, "wtimeout" : { "$numberInt" : "1000" } } +{ "w" : { "$numberInt" : "1" }, "j" : true, "wtimeout" : { "$numberInt" : "1000" } } { "j" : true } -{ "wtimeout" : 1000 } +{ "wtimeout" : { "$numberInt" : "1000" } } ===DONE=== diff --git a/tests/writeResult/writeresult-getserver-001.phpt b/tests/writeResult/writeresult-getserver-001.phpt index 1ca2d8622..7063450cc 100644 --- a/tests/writeResult/writeresult-getserver-001.phpt +++ b/tests/writeResult/writeresult-getserver-001.phpt @@ -9,7 +9,7 @@ MongoDB\Driver\WriteResult::getUpsertedIds() require_once __DIR__ . "/../utils/basic.inc"; $manager = create_test_manager(); -$server = $manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY)); +$server = $manager->selectServer(new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::PRIMARY)); $bulk = new MongoDB\Driver\BulkWrite; $bulk->insert(['x' => 1]);