Skip to content

Changed PHP samples to PSR standards #867

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

Closed
wants to merge 8 commits into from
Closed

Changed PHP samples to PSR standards #867

wants to merge 8 commits into from

Conversation

ConsoleTVs
Copy link

The samples were changed to the standards of PHP. More information can be found here: https://www.php-fig.org/psr/

yitam and others added 6 commits May 30, 2018 12:10
* Fixed the potential error reported by Prefast code analysis

* Use SQLSRV_ASSERT for checking NULL ptrs

* For these AKV tests check env despite not AE connected

* Added the driver option to run functional tests

* Fixed connection pooling tests for more than one ODBC drivers

* added driver option to pdo isPooled.php

* Removed win32 ifdefs re connection resiliency (#802)

* Set the driver argument for getDSN to null by default (#798)

* Added the driver argument to getDSN

* Dropped the driver argument but set to null as default

* Removed the AE condition in locale support

* Modified the AE condition for locale support

* Changed int to SQLLEN to avoid infinite loop (#806)

* Version 5.3.0 (#803)

* Version 5.3.0

* Fixed the wrong replacements

* Added comments block to m4 files

* Use dnl for comments

*  Modified AE fetch phptypes test to insert only one row at a time and loop through php types (#801)

* Modified AE fetch phptypes test to insert only one row at a time and loop through php types

* Fixed formatting

* Streamlined two very similar large column name tests (#807)

* Streamlined two very similar large column name tests

* Changed the EOL

* Updates to change log and readme (#811)

* Updates to change log and readme

* Dropped support for Ubuntu 17

* Modified as per review comments

* Fixed connection resiliency tests for Unix, updated AppVeyor for ODBC 17.2

* Fixed expected output

* Fixed output and skipifs

* Fixed skipifs and output

* Fixed driver name

* Updated installation instructions and sample script (#813)

* Updated instructions and sample test for 5.3.0 RTW

* Fixed sample code to adhere to php coding standard

* Fixed cases and spaces

* Modified NOTE for UB 18.04 based on review comments

* Added 'exit'

* Modified change log and readme based on review to PR 811

* Applied review comments

* build output to debug appveyor failure

* removed debug output

* Streamlined two very similar large column name tests (#815)

* Streamlined two very similar large column name tests

* Added random number of test table names to avoid operand clash issues

* Replaced to with for based on review

* Changelog updated

* changelog updated, test skipif changed to run on unix platforms

* Fixed skipif typo

* Fixed typo in skipif for pdo

* Fixed some output for Travis

* Moved error checking inside pdo connres tests

* Added links back to changelog

* Fixed output for sqlsrv connres tests

* Fixed output

* Fixed output again
* Fixed the potential error reported by Prefast code analysis

* Use SQLSRV_ASSERT for checking NULL ptrs

* For these AKV tests check env despite not AE connected

* Added the driver option to run functional tests

* Fixed connection pooling tests for more than one ODBC drivers

* added driver option to pdo isPooled.php

* Removed win32 ifdefs re connection resiliency (#802)

* Set the driver argument for getDSN to null by default (#798)

* Added the driver argument to getDSN

* Dropped the driver argument but set to null as default

* Removed the AE condition in locale support

* Modified the AE condition for locale support

* Changed int to SQLLEN to avoid infinite loop (#806)

* Version 5.3.0 (#803)

* Version 5.3.0

* Fixed the wrong replacements

* Added comments block to m4 files

* Use dnl for comments

*  Modified AE fetch phptypes test to insert only one row at a time and loop through php types (#801)

* Modified AE fetch phptypes test to insert only one row at a time and loop through php types

* Fixed formatting

* Streamlined two very similar large column name tests (#807)

* Streamlined two very similar large column name tests

* Changed the EOL

* Updates to change log and readme (#811)

* Updates to change log and readme

* Dropped support for Ubuntu 17

* Modified as per review comments

* Fixed connection resiliency tests for Unix, updated AppVeyor for ODBC 17.2

* Fixed expected output

* Fixed output and skipifs

* Fixed skipifs and output

* Fixed driver name

* Updated installation instructions and sample script (#813)

* Updated instructions and sample test for 5.3.0 RTW

* Fixed sample code to adhere to php coding standard

* Fixed cases and spaces

* Modified NOTE for UB 18.04 based on review comments

* Added 'exit'

* Modified change log and readme based on review to PR 811

* Applied review comments

* build output to debug appveyor failure

* removed debug output

* Streamlined two very similar large column name tests (#815)

* Streamlined two very similar large column name tests

* Added random number of test table names to avoid operand clash issues

* Replaced to with for based on review

* Changelog updated

* changelog updated, test skipif changed to run on unix platforms

* Fixed skipif typo

* Fixed typo in skipif for pdo

* Fixed some output for Travis

* Moved error checking inside pdo connres tests

* Added links back to changelog

* Fixed output for sqlsrv connres tests

* Fixed output

* Fixed output again

* Fixed skipifs for connres

* Tweaked per review comments

* Changes made to source and tests to support PHP 7.3 (#822)

* Changes made to support php 7.3

* Correct use of the smart pointer

* Fixed the tests for 7.3

* Some clean up for array_init()

* Fixed formattings and clean up

* One more fix

* Initialising strings with nulls

* Removed some spaces

* Made array index spacing consistent

* Fix for compilation problem

* Fix for compilation problem again

* Before freeing stmt in destructor check if dbh driver data is NULL  (#829)

* Issue 434 - set dbh driver data to NULL as well in destructor

* Reverted the last change but instead check if dbh driver_data is already freed

* Modified the comment

* Added driver to the skipif conditions (#831)

* Used git clone instead to download source from a branch of a tag (#832)

* Modified the error handling to make it more flexible (#833)

* Made error handling more flexible

* Fixed a minor issue with a test

* Enabled Spectre Mitigations (#836)

* Incorporated changes in PR 634 to pdo_sqlsrv (#834)

* Incorporated changes in PR 634 to pdo_sqlsrv

* Reverted the changes because the array is for internal use only

* Modified README re user's suggestion (#841)

* Modified README re user's suggestion

* Moved the if condition to the end as per review

* Adding supporting for Azure AD access token (#837)

* Adding supporting for Azure AD access token

* Added more comments for the AD access token skipif files

* Save the pointer to access token struct until after connecting

* Clear the access token data before freeing the memory

* Added a reference as per review

* Feature request - new PDO_STMT_OPTION_FETCHES_DATETIME_TYPE flag for pdo_sqlsrv to return datetime as objects (#842)

* Feature request - issue 648

* Fixed constructor for field_cache and added another test

* Added tests for FETCH_BOUND

* Added a new test for output param

* Modified output param test to set attributes differently

* Removed a useless helped function in a test

* Combined two new tests into one as per review

* Uncommented dropTable

* Feature request - add ReturnDatesAsStrings option to statement level for sqlsrv  (#844)

* Added ReturnDatesAsStrings option to the statement level

* Added new tests for ReturnDatesAsStrings at statement level

* Added more datetime types as per review

* Updated version 5.4.0-preview (#846)

* Updated version 5.4.0-preview

* Replaced 5.3 with 5.4

* Fixed sqlsrv datetime tests to connect with ColumnEncryption variables (#849)

* Change log for 5.4.0-preview (#850)

* Updated change log for 5.4.0-preview

* Updated 5.4.0 preview to add two new feature requests

* Modified change log as per review

* Modified the wordings

* Updated readme, changelog, and install instructions
Change readme links to https
@msftclas
Copy link

msftclas commented Oct 18, 2018

CLA assistant check
All CLA requirements met.

@coveralls
Copy link

coveralls commented Oct 18, 2018

Coverage Status

Coverage increased (+0.6%) to 75.422% when pulling 9204f3a on ConsoleTVs:master into 2a9398f on Microsoft:dev.

@david-puglielli
Copy link
Contributor

Thank you @ConsoleTVs we will study these changes and decide whether to merge shortly.

@ConsoleTVs
Copy link
Author

Great thanks!

@yitam
Copy link
Contributor

yitam commented Oct 22, 2018

Thanks @ConsoleTVs for your contributions. Please do the following:

  1. merge to dev branch instead of master (at the next preview we will merge to master)
  2. keep the original Unix line endings
  3. make indentations consistent and replace all tabs with 4 spaces

Looking forward to hearing from you.

@yitam yitam mentioned this pull request Oct 26, 2018
@yitam
Copy link
Contributor

yitam commented Oct 26, 2018

hi @ConsoleTVs , I haven't heard from you since I responded. In case you're not aware, there is another very similar pull request, #870

Please note that we will merge either #870 or this, not both, so whichever responds first will get the PR merged. Thanks!

@ConsoleTVs
Copy link
Author

I'm fixing it right now.

@codecov-io
Copy link

codecov-io commented Oct 27, 2018

Codecov Report

Merging #867 into dev will increase coverage by 0.75%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##              dev     #867      +/-   ##
==========================================
+ Coverage   79.42%   80.18%   +0.75%     
==========================================
  Files          25       25              
  Lines        7646     7419     -227     
==========================================
- Hits         6073     5949     -124     
+ Misses       1573     1470     -103
Impacted Files Coverage Δ
...x86/php-7.1.23-src/ext/sqlsrv/shared/core_sqlsrv.h 85.44% <0%> (-1.55%) ⬇️
...x86/php-7.1.23-src/ext/sqlsrv/shared/core_stmt.cpp 84.03% <0%> (-1.09%) ⬇️
...php-7.1.23-src/ext/pdo_sqlsrv/shared/core_sqlsrv.h 82.67% <0%> (-0.49%) ⬇️
...x86/php-7.1.23-src/ext/sqlsrv/shared/core_conn.cpp 79.72% <0%> (-0.28%) ⬇️
...phpdev/vc14/x86/php-7.1.23-src/ext/sqlsrv/stmt.cpp 88.75% <0%> (-0.2%) ⬇️
...php-7.1.23-src/ext/pdo_sqlsrv/shared/core_conn.cpp 84.32% <0%> (-0.15%) ⬇️
...c14/x86/php-7.1.23-src/ext/pdo_sqlsrv/pdo_stmt.cpp 86.27% <0%> (-0.13%) ⬇️
...phpdev/vc14/x86/php-7.1.23-src/ext/sqlsrv/conn.cpp 83.85% <0%> (-0.05%) ⬇️
...phpdev/vc14/x86/php-7.1.23-src/ext/sqlsrv/util.cpp 84.37% <0%> (ø) ⬆️
...-7.1.23-src/ext/pdo_sqlsrv/shared/core_results.cpp 60.4% <0%> (ø) ⬆️
... and 3 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 2a9398f...53c8cea. Read the comment docs.

@ConsoleTVs ConsoleTVs changed the base branch from master to dev October 27, 2018 11:08
@ConsoleTVs
Copy link
Author

it's done @yitam

@yitam
Copy link
Contributor

yitam commented Oct 29, 2018

Hi @ConsoleTVs I appreciate your prompt response, but from your master branch there are conflicts and too many files changed. Could you fix these first please? Make sure your working branch get the latest from our dev branch.

This was referenced Oct 29, 2018
@yitam yitam closed this Nov 23, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants