-
Notifications
You must be signed in to change notification settings - Fork 374
Fixed the skipif wordings and styles #1070
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
<?php | ||
if (!extension_loaded("pdo") || !extension_loaded('pdo_sqlsrv')) | ||
die("PDO driver cannot be loaded; skipping test.\n"); | ||
?> | ||
if (!extension_loaded("pdo_sqlsrv")) { | ||
die("skip Extension not loaded"); | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. why get rid of the closing There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Because the closing tag of a PHP block at the end of a file is actually optional |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,8 @@ | ||
<?php | ||
if (!extension_loaded("pdo") || !extension_loaded('pdo_sqlsrv')) | ||
die("PDO driver cannot be loaded; skipping test.\n"); | ||
if (!extension_loaded("pdo_sqlsrv")) { | ||
die("skip Extension not loaded"); | ||
} | ||
require 'MsSetup.inc'; | ||
if ($daasMode) die("skip test not applicable in Azure\n"); | ||
|
||
?> | ||
if ($daasMode) { | ||
die("skip test not applicable in Azure\n"); | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,17 @@ | ||
<?php | ||
if (!extension_loaded("pdo") || !extension_loaded('pdo_sqlsrv')) { | ||
die("PDO driver cannot be loaded; skipping test.\n"); | ||
} | ||
require_once("MsSetup.inc"); | ||
require_once("MsCommon_mid-refactor.inc"); | ||
$dsn = getDSN($server, null); | ||
$conn = new PDO($dsn, $uid, $pwd); | ||
if (! $conn) { | ||
echo("Error: could not connect during SKIPIF!"); | ||
} elseif (isColEncrypted()) { | ||
if (!isAEQualified($conn)) { | ||
die("skip - AE feature not supported in the current environment."); | ||
} | ||
} | ||
<?php | ||
if (!extension_loaded("pdo_sqlsrv")) { | ||
die("skip Extension not loaded"); | ||
} | ||
|
||
require_once("MsSetup.inc"); | ||
require_once("MsCommon_mid-refactor.inc"); | ||
|
||
$dsn = getDSN($server, null); | ||
$conn = new PDO($dsn, $uid, $pwd); | ||
if (! $conn) { | ||
die("skip could not connect during SKIPIF!"); | ||
} elseif (isColEncrypted()) { | ||
if (!isAEQualified($conn)) { | ||
die("skip - AE feature not supported in the current environment."); | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,24 +1,25 @@ | ||
<?php | ||
if (!extension_loaded("pdo") || !extension_loaded('pdo_sqlsrv')) { | ||
die("PDO driver cannot be loaded; skipping test.\n"); | ||
} | ||
|
||
require_once("MsSetup.inc"); | ||
|
||
if ($keystore != 'akv') | ||
die ( 'skip - the test requires valid Azure Key Vault credentials.' ); | ||
|
||
if ($driver != "ODBC Driver 17 for SQL Server") { | ||
// the testing is not set to use ODBC 17 | ||
die("skip - AE feature not supported in the current environment."); | ||
} | ||
|
||
require_once("MsCommon_mid-refactor.inc"); | ||
|
||
$dsn = getDSN($server, null); | ||
$conn = new PDO($dsn, $uid, $pwd); | ||
if (! $conn) { | ||
echo("Error: could not connect during SKIPIF!"); | ||
} elseif (!isAEQualified($conn)) { | ||
die("skip - AE feature not supported in the current environment."); | ||
} | ||
<?php | ||
if (!extension_loaded("pdo_sqlsrv")) { | ||
die("skip Extension not loaded"); | ||
} | ||
|
||
require_once("MsSetup.inc"); | ||
|
||
if ($keystore != 'akv') { | ||
die('skip the test requires valid Azure Key Vault credentials.'); | ||
} | ||
|
||
if ($driver != "ODBC Driver 17 for SQL Server") { | ||
// the testing is not set to use ODBC 17 | ||
die("skip AE feature not supported in the current environment."); | ||
} | ||
|
||
require_once("MsCommon_mid-refactor.inc"); | ||
|
||
$dsn = getDSN($server, null); | ||
$conn = new PDO($dsn, $uid, $pwd); | ||
if (! $conn) { | ||
die("skip could not connect during SKIPIF!"); | ||
} elseif (!isAEQualified($conn)) { | ||
die("skip AE feature not supported in the current environment."); | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,9 @@ | ||
<?php | ||
|
||
if ( !( strtoupper( substr( php_uname( 's' ),0,3 ) ) === 'WIN' ) ) die( "Skip, test on windows only." ); | ||
if (!(strtoupper(substr(php_uname('s'), 0, 3)) === 'WIN')) { | ||
die("Skip test on windows only."); | ||
} | ||
|
||
if (!extension_loaded("pdo") || !extension_loaded('pdo_sqlsrv')) | ||
die("PDO driver cannot be loaded; skipping test.\n"); | ||
|
||
?> | ||
if (!extension_loaded("pdo") || !extension_loaded('pdo_sqlsrv')) { | ||
die("skip extension not loaded"); | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,29 +1,28 @@ | ||
<?php | ||
|
||
if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') { | ||
die("Skipped: Test for Linux and macOS"); | ||
die("skip Test for Linux and macOS"); | ||
} | ||
|
||
if (!extension_loaded("sqlsrv")) { | ||
die("skip extension not loaded"); | ||
if (!extension_loaded("pdo_sqlsrv")) { | ||
die("skip Extension not loaded"); | ||
} | ||
|
||
// check if the required ini file exists | ||
$inifile = PHP_CONFIG_FILE_SCAN_DIR."/99-overrides.ini"; | ||
if (!file_exists($inifile)) { | ||
die("required ini file not exists"); | ||
die("skip required ini file not exists"); | ||
} | ||
|
||
// if the file exists, is it writable? '@' sign is used to suppress warnings | ||
$file = @fopen($inifile, "w"); | ||
if (!$file) { | ||
die("required ini file not writable"); | ||
die("skip required ini file not writable"); | ||
} | ||
|
||
fclose($file); | ||
|
||
$loc = setlocale(LC_TIME, 'de_DE.UTF-8'); | ||
if (empty($loc)) { | ||
die("required locale not available"); | ||
die("skip required locale not available"); | ||
} | ||
?> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,15 @@ | ||
<?php | ||
|
||
if (! extension_loaded( 'pdo' ) || ! extension_loaded( 'pdo_sqlsrv' )) | ||
die( "PDO driver cannot be loaded; skipping test.\n" ); | ||
if (!extension_loaded("pdo_sqlsrv")) { | ||
die("skip Extension not loaded"); | ||
} | ||
|
||
require_once( "MsSetup.inc" ); | ||
require_once( "MsCommon.inc" ); | ||
require_once("MsSetup.inc"); | ||
require_once("MsCommon.inc"); | ||
|
||
$conn = ae_connect(); | ||
if( ! $conn ) | ||
{ | ||
echo( "Error: could not connect during SKIPIF!" ); | ||
} | ||
else if(! IsAEQualified($conn)) | ||
{ | ||
die( "skip - AE feature not supported in the current environment." ); | ||
if (! $conn) { | ||
die("skip could not connect during SKIPIF!"); | ||
} elseif (! IsAEQualified($conn)) { | ||
die("skip AE feature not supported in the current environment."); | ||
} | ||
?> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,24 +1,24 @@ | ||
<?php | ||
if (! extension_loaded("sqlsrv")) { | ||
die("skip extension not loaded"); | ||
} | ||
require_once("MsSetup.inc"); | ||
if ($keystore != 'akv') | ||
die ( 'skip - the test requires valid Azure Key Vault credentials.' ); | ||
if ($driver != "ODBC Driver 17 for SQL Server") { | ||
// the testing is not set to use ODBC 17 | ||
die("skip - AE feature not supported in the current environment."); | ||
} | ||
require_once('MsCommon.inc'); | ||
$conn = AE\connect(); | ||
if (! $conn) { | ||
echo("Error: could not connect during SKIPIF!"); | ||
} elseif (!AE\isQualified($conn)) { | ||
die("skip - AE feature not supported in the current environment."); | ||
} | ||
?> | ||
<?php | ||
|
||
if (! extension_loaded("sqlsrv")) { | ||
die("skip extension not loaded"); | ||
} | ||
|
||
require_once("MsSetup.inc"); | ||
if ($keystore != 'akv') { | ||
die('skip the test requires valid Azure Key Vault credentials.'); | ||
} | ||
|
||
if ($driver != "ODBC Driver 17 for SQL Server") { | ||
// the testing is not set to use ODBC 17 | ||
die("skip AE feature not supported in the current environment."); | ||
} | ||
|
||
require_once('MsCommon.inc'); | ||
|
||
$conn = AE\connect(); | ||
if (! $conn) { | ||
die("skip could not connect during SKIPIF!"); | ||
} elseif (!AE\isQualified($conn)) { | ||
die("skip AE feature not supported in the current environment."); | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,9 @@ | ||
<?php | ||
|
||
if ( !( strtoupper( substr( php_uname( 's' ),0,3 ) ) === 'WIN' ) ) die( "Skip, test on windows only." ); | ||
if (!(strtoupper(substr(php_uname('s'), 0, 3)) === 'WIN')) { | ||
die("Skip Test on windows only."); | ||
} | ||
|
||
if (!extension_loaded("sqlsrv")) { | ||
die("skip extension not loaded"); | ||
} | ||
|
||
?> |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I assume this is because PHP 7.4 is not yet available in the standard repos?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes, as of today :)