Use the correct skipif

2017-10-27 09:32:57 -07:00 · 2017-10-27 09:32:57 -07:00 · 886a7d78b8
parent 886b0af488
commit 886a7d78b8
33 changed files with 35 additions and 35 deletions
--- a/test/functional/sqlsrv/TC36_Close.phpt
+++ b/test/functional/sqlsrv/TC36_Close.phpt
@ -7,7 +7,7 @@ Validates that a closed statement cannot be reused.
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
--- a/test/functional/sqlsrv/TC37_QueryTimeout.phpt
+++ b/test/functional/sqlsrv/TC37_QueryTimeout.phpt
@ -9,7 +9,7 @@ longer than the query timeout.
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
--- a/test/functional/sqlsrv/TC38_InvalidQuery.phpt
+++ b/test/functional/sqlsrv/TC38_InvalidQuery.phpt
@ -5,7 +5,7 @@ Verifies of "sqlsrv_query" response to invalid query attempts
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
--- a/test/functional/sqlsrv/TC39_Cursors.phpt
+++ b/test/functional/sqlsrv/TC39_Cursors.phpt
@ -5,7 +5,7 @@ Verifies the functionality associated with scrollable resultsets.
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
--- a/test/functional/sqlsrv/TC41_FetchMetadata.phpt
+++ b/test/functional/sqlsrv/TC41_FetchMetadata.phpt
@ -9,7 +9,7 @@ Validates functionality with statement in both prepared and executed state.
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
--- a/test/functional/sqlsrv/TC42_FetchField.phpt
+++ b/test/functional/sqlsrv/TC42_FetchField.phpt
@ -6,7 +6,7 @@ retrieving fields from a table including rows with all supported SQL types (28 t
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
--- a/test/functional/sqlsrv/TC43_FetchData.phpt
+++ b/test/functional/sqlsrv/TC43_FetchData.phpt
@ -3,7 +3,7 @@ Fetch Field Data Test verifies the data retrieved via "sqlsrv_get_field"
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php

--- a/test/functional/sqlsrv/TC44_FetchArray.phpt
+++ b/test/functional/sqlsrv/TC44_FetchArray.phpt
@ -6,7 +6,7 @@ by checking all fetch type modes.
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
--- a/test/functional/sqlsrv/TC45_FetchObject.phpt
+++ b/test/functional/sqlsrv/TC45_FetchObject.phpt
@ -5,7 +5,7 @@ Verifies data retrieval via "sqlsrv_fetch_object".
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
--- a/test/functional/sqlsrv/TC46_FetchNextResult.phpt
+++ b/test/functional/sqlsrv/TC46_FetchNextResult.phpt
@ -5,7 +5,7 @@ Verifies the functionality of "sqlsrv_next_result"
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
--- a/test/functional/sqlsrv/TC47_ParamQuery.phpt
+++ b/test/functional/sqlsrv/TC47_ParamQuery.phpt
@ -6,7 +6,7 @@ The query behavior is checked for all updateable data types.
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
--- a/test/functional/sqlsrv/TC48_FetchScrollable.phpt
+++ b/test/functional/sqlsrv/TC48_FetchScrollable.phpt
@ -5,7 +5,7 @@ Verifies data retrieval with scrollable result sets.
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
--- a/test/functional/sqlsrv/TC51_StreamRead.phpt
+++ b/test/functional/sqlsrv/TC51_StreamRead.phpt
@ -6,7 +6,7 @@ can be successfully retrieved as streams.
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
--- a/test/functional/sqlsrv/TC52_StreamSend.phpt
+++ b/test/functional/sqlsrv/TC52_StreamSend.phpt
@ -8,7 +8,7 @@ via sqlsrv_send_stream_data (i.e. after execution).
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
--- a/test/functional/sqlsrv/TC53_StreamCancel.phpt
+++ b/test/functional/sqlsrv/TC53_StreamCancel.phpt
@ -7,7 +7,7 @@ Verifies that a stream is invalidated by:
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
--- a/test/functional/sqlsrv/TC54_StreamPrepared.phpt
+++ b/test/functional/sqlsrv/TC54_StreamPrepared.phpt
@ -7,7 +7,7 @@ Validates that a warning message is issued when parameters are not passed by ref
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
--- a/test/functional/sqlsrv/TC55_StreamScrollable.phpt
+++ b/test/functional/sqlsrv/TC55_StreamScrollable.phpt
@ -5,7 +5,7 @@ Verifies the streaming behavior with scrollable resultsets.
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
--- a/test/functional/sqlsrv/TC61_TransactionExecution.phpt
+++ b/test/functional/sqlsrv/TC61_TransactionExecution.phpt
@ -8,7 +8,7 @@ Two types of sequences are explored:
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
--- a/test/functional/sqlsrv/TC62_TransactionDisconnect.phpt
+++ b/test/functional/sqlsrv/TC62_TransactionDisconnect.phpt
@ -6,7 +6,7 @@ implicitly rollback the database changes attempted by the transaction.
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
--- a/test/functional/sqlsrv/TC63_TransactionBounds.phpt
+++ b/test/functional/sqlsrv/TC63_TransactionBounds.phpt
@ -10,7 +10,7 @@ are inserted into the same table.
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
--- a/test/functional/sqlsrv/TC64_TransactionProc.phpt
+++ b/test/functional/sqlsrv/TC64_TransactionProc.phpt
@ -7,7 +7,7 @@ Two types of sequences are explored.
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
--- a/test/functional/sqlsrv/TC71_StoredProc.phpt
+++ b/test/functional/sqlsrv/TC71_StoredProc.phpt
@ -5,7 +5,7 @@ Verifies the ability to create and subsequently call a stored procedure.
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
--- a/test/functional/sqlsrv/TC72_StoredFunc.phpt
+++ b/test/functional/sqlsrv/TC72_StoredFunc.phpt
@ -5,7 +5,7 @@ Verifies the ability to create and subsequently call a stored procedure.
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
--- a/test/functional/sqlsrv/TC73_ProcCall.phpt
+++ b/test/functional/sqlsrv/TC73_ProcCall.phpt
@ -5,7 +5,7 @@ Verifies the ability to create and subsequently call a stored procedure.
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
--- a/test/functional/sqlsrv/TC74_ProcQuery.phpt
+++ b/test/functional/sqlsrv/TC74_ProcQuery.phpt
@ -7,7 +7,7 @@ Checks all numeric data types (i.e. 10 SQL types).
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
--- a/test/functional/sqlsrv/TC75_ProcRoundtrip.phpt
+++ b/test/functional/sqlsrv/TC75_ProcRoundtrip.phpt
@ -6,7 +6,7 @@ Checks all character data types.
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
--- a/test/functional/sqlsrv/TC76_StoredProcNull.phpt
+++ b/test/functional/sqlsrv/TC76_StoredProcNull.phpt
@ -5,7 +5,7 @@ Verifies the ability to return a null string from a stored procedure.
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
--- a/test/functional/sqlsrv/TC78_RegressionVSTS611146.phpt
+++ b/test/functional/sqlsrv/TC78_RegressionVSTS611146.phpt
@ -6,7 +6,7 @@ Checks all character data types.
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
--- a/test/functional/sqlsrv/TC79_RegressionVSTS846501.phpt
+++ b/test/functional/sqlsrv/TC79_RegressionVSTS846501.phpt
@ -6,7 +6,7 @@ Checks all character data types.
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
--- a/test/functional/sqlsrv/TC81_MemoryCheck.phpt
+++ b/test/functional/sqlsrv/TC81_MemoryCheck.phpt
@ -6,7 +6,7 @@ emalloc (which only allocate memory in the memory space allocated for the PHP pr
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
--- a/test/functional/sqlsrv/TC82_StoredProcRS.phpt
+++ b/test/functional/sqlsrv/TC82_StoredProcRS.phpt
@ -5,7 +5,7 @@ Test output string parameters with rows affected return results before output pa
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
--- a/test/functional/sqlsrv/TC83_ComplexInsert.phpt
+++ b/test/functional/sqlsrv/TC83_ComplexInsert.phpt
@ -5,7 +5,7 @@ Test the driver behavior with a complex insert query.
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 require_once('MsCommon.inc');
--- a/test/functional/sqlsrv/sqlsrv_ae_insert_sqltype_numeric.phpt
+++ b/test/functional/sqlsrv/sqlsrv_ae_insert_sqltype_numeric.phpt
@ -45,14 +45,14 @@ foreach ($dataTypes as $dataType) {

        if (!AE\isColEncrypted()) {
            if ($r === false) {
-                $isCompatibleible = false;
+                $isCompatible = false;
                foreach ($compatList[$dataType] as $compatType) {
                    if (stripos($compatType, $sqlType) !== false) {
-                        $isCompatibleible = true;
+                        $isCompatible = true;
                    }
                }
                // 22018 is the SQLSTATE for any incompatible conversion errors
-                if ($isCompatibleible && sqlsrv_errors()[0]['SQLSTATE'] == 22018) {
+                if ($isCompatible && sqlsrv_errors()[0]['SQLSTATE'] == 22018) {
                    echo "$sqlType should be compatible with $dataType\n";
                    $success = false;
                }