Skip to content

Removed ext/oci8 and ext/pdo_oci #13327

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.

Sign up for GitHub

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 5 commits into from
Feb 7, 2024
Merged

Removed ext/oci8 and ext/pdo_oci #13327

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
be626dc
Removed ext/oci8 and ext/pdo_oci
derickr Feb 5, 2024
beb39a5
Remove OCI compile flags from CI
derickr Feb 5, 2024
57b67e9
Remove Oracle container startup from CI
derickr Feb 5, 2024
5786064
Remove traces of OCI8/PDO_OCI from auxilairy files
derickr Feb 6, 2024
442821c
Remove oci functions from Optimizer info
derickr Feb 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 0 additions & 2 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,6 @@ jobs:
--with-snmp \
`#--with-unixODBC` \
`#--with-pdo-odbc=unixODBC,/usr` \
`#--with-pdo-oci=shared,instantclient,/opt/oracle/instantclient` \
`#--with-oci8=shared,instantclient,/opt/oracle/instantclient` \
--with-config-file-path=/etc \
--with-config-file-scan-dir=/etc/php.d \
--with-pdo-firebird \
Expand Down
2 changes: 0 additions & 2 deletions .github/actions/configure-x64/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,6 @@ runs:
${{ inputs.skipSlow == 'false' && '--with-snmp' || '' }} \
${{ inputs.skipSlow == 'false' && '--with-unixODBC' || '' }} \
${{ inputs.skipSlow == 'false' && '--with-pdo-odbc=unixODBC,/usr' || '' }} \
$([ -d "/opt/oracle/instantclient" ] && echo '--with-pdo-oci=shared,instantclient,/opt/oracle/instantclient') \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The CI should be moved to the PECL repos.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll add you as a collaborator so you can do so.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you, I contribute to CI a lot, but I am not a C expert so I would be happy if someone else can do this.

The first step should be to convert GH workflows into resuable GH actions so the PECL repos can take the advantage of sanitizers, nightly jobs, ...

Also CI parts like https://github.com/php/php-src/blob/php-8.3.2/.github/workflows/nightly.yml#L81 should be moved.

To the migration, I wonder if monorepo for all pecl packages under php org was considered. IMO, managing oci8 and pdo_oci separately imply a lot of extra time and communication needed to maintain. Not mentioning keeping the changes consistent is quite resource demanding.

$([ -d "/opt/oracle/instantclient" ] && echo '--with-oci8=shared,instantclient,/opt/oracle/instantclient') \
--with-config-file-path=/etc \
--with-config-file-scan-dir=/etc/php.d \
${{ inputs.skipSlow == 'false' && '--with-pdo-firebird' || '' }} \
Expand Down
30 changes: 0 additions & 30 deletions .github/actions/setup-oracle/action.yml
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions .github/labeler.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,6 @@
"Extension: mysqlnd":
- ext/mysqlnd/**/*

"Extension: oci8":
- ext/oci8/**/*

"Extension: odbc":
- ext/odbc/**/*

Expand Down Expand Up @@ -125,9 +122,6 @@
"Extension: pdo_mysql":
- ext/pdo_mysql/**/*

"Extension: pdo_oci":
- ext/pdo_oci/**/*

"Extension: pdo_odbc":
- ext/pdo_odbc/**/*

Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,6 @@ jobs:
ref: ${{ matrix.branch.ref }}
- name: Create MSSQL container
uses: ./.github/actions/setup-mssql
- name: Create Oracle container
uses: ./.github/actions/setup-oracle
- name: apt
uses: ./.github/actions/apt-x64
- name: System info
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,6 @@ jobs:
- name: Create MSSQL container
if: ${{ !matrix.asan }}
uses: ./.github/actions/setup-mssql
- name: Create Oracle container
if: ${{ !matrix.asan }}
uses: ./.github/actions/setup-oracle
- name: Setup Caddy server
uses: ./.github/actions/setup-caddy
- name: ccache
Expand Down
2 changes: 0 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,8 +277,6 @@ tmp-php.ini
# ------------------------------------------------------------------------------
# Generated by `./configure --enable-dtrace` for using DTrace framework
# ------------------------------------------------------------------------------
/ext/oci8/oci8_dtrace_gen.h
/ext/oci8/oci8_dtrace_gen.h.bak
/Zend/zend_dtrace_gen.h
/Zend/zend_dtrace_gen.h.bak

Expand Down
12 changes: 0 additions & 12 deletions EXTENSIONS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,6 @@ MAINTENANCE: Maintained
STATUS: Working
SINCE: 5.3
-------------------------------------------------------------------------------
EXTENSION: oci8
PRIMARY MAINTAINER: Christopher Jones <[email protected]> (2007 - 2017)
Antony Dovgal <[email protected]> (2003 - 2009)
MAINTENANCE: Maintained
STATUS: Working
-------------------------------------------------------------------------------
EXTENSION: odbc
PRIMARY MAINTAINER: Daniel R. Kalowsky <[email protected]> (2000 - 2004)
MAINTENANCE: Maintained
Expand Down Expand Up @@ -139,12 +133,6 @@ MAINTENANCE: Odd fixes
STATUS: Working
SINCE: 5.1
-------------------------------------------------------------------------------
EXTENSION: pdo_oci
PRIMARY MAINTAINER: Christopher Jones <[email protected]> (2007 - 2017)
MAINTENANCE: Odd fixes
STATUS: Working
SINCE: 5.1
-------------------------------------------------------------------------------
EXTENSION: pdo_pgsql
PRIMARY MAINTAINER: Ilia Alshanetsky <[email protected]> (2004 - 2011)
MAINTENANCE: Odd fixes
Expand Down
2 changes: 1 addition & 1 deletion build/Makefile.global
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ clean:
distclean: clean
rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h main/internal_functions_cli.c main/internal_functions.c Zend/zend_dtrace_gen.h Zend/zend_dtrace_gen.h.bak Zend/zend_config.h
rm -f main/build-defs.h scripts/phpize
rm -f ext/date/lib/timelib_config.h ext/mbstring/libmbfl/config.h ext/oci8/oci8_dtrace_gen.h ext/oci8/oci8_dtrace_gen.h.bak
rm -f ext/date/lib/timelib_config.h ext/mbstring/libmbfl/config.h
rm -f scripts/man1/phpize.1 scripts/php-config scripts/man1/php-config.1 sapi/cli/php.1 sapi/cgi/php-cgi.1 sapi/phpdbg/phpdbg.1 ext/phar/phar.1 ext/phar/phar.phar.1
rm -f sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.service sapi/fpm/php-fpm.8 sapi/fpm/status.html
rm -f ext/phar/phar.phar ext/phar/phar.php
Expand Down
18 changes: 0 additions & 18 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1842,24 +1842,6 @@ X
fi
fi

dnl Warn about Apache if oci8 extension is enabled on Linux.
if test "$PHP_OCI8" != "no"; then
if test "$PHP_SIGCHILD" != "yes"; then
if test "$PHP_OCI8_INSTANT_CLIENT" = "no"; then
cat <<X
+--------------------------------------------------------------------+
| Notice: |
| If you encounter <defunc> processes when using a local Oracle |
| database, set the value BEQUEATH_DETACH=YES in Oracle Net's |
| sqlnet.ora file on the PHP host, or set the environment variable |
| BEQUEATH_DETACH to YES before starting Apache. If the problem |
| still occurs, then recompile PHP and specify --enable-sigchild |
| when configuring. |
X
fi
fi
fi

fi
])
AC_OUTPUT
2 changes: 0 additions & 2 deletions ext/oci8/CREDITS
View file
Open in desktop

This file was deleted.

68 changes: 0 additions & 68 deletions ext/oci8/LICENSE
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions ext/oci8/README.md
View file
Open in desktop

This file was deleted.

Loading