Skip to content

Commit 8783884

Browse files
author
omars44
committed
packaging: 2.7.0
1 parent 5c30d55 commit 8783884

File tree

6 files changed

+80
-33
lines changed

6 files changed

+80
-33
lines changed

.docker/entrypoint.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
pecl package package.xml
2-
pecl install ./solr-2.6.0.tgz
2+
pecl install ./solr-2.7.0.tgz
33
echo "extension=solr.so" > /usr/local/etc/php/conf.d/solr.ini
44
php -m | grep solr
5+
bash

Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM php:8.2.11-cli-alpine3.17
1+
FROM php:8.3-cli
22

33
RUN apt update && apt install libxml2-dev libcurl4-gnutls-dev --yes
44

@@ -8,6 +8,8 @@ COPY .docker/entrypoint.sh /opt/
88

99
RUN mkdir /opt/solr2
1010

11+
COPY ./ /opt/solr2
12+
1113
WORKDIR /opt/solr2
1214

13-
ENTRYPOINT ["sh","/opt/entrypoint.sh"]
15+
ENTRYPOINT ["sh","/opt/entrypoint.sh"]

NEWS

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +0,0 @@
1-
Features:
2-
- Support Highlight Query (#28)
3-
4-
API Changes:
5-
- Added SolrQuery SolrQuery::setHighlightQuery(string $q)
6-
- Added string SolrQuery::getHighlightQuery()
7-
8-
Bug Fixes:
9-
- Fix parsed parameter types (#37)
10-
- Fix compile error: libcurl on linux multi-arch support (#46)
11-
- Fix SegFault in SolrClient::optimize() (debug mode)
12-
- Fix Missing Windows DLLs (#51) / available on github releases now
13-
14-
Internals:
15-
- ci: windows tests (#51)
16-
- parse_int macros

docs/documentation.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
*/
1919

2020
define('SOLR_MAJOR_VERSION', 2);
21-
define('SOLR_MINOR_VERSION', 6);
21+
define('SOLR_MINOR_VERSION', 7);
2222
define('SOLR_PATCH_VERSION', 0);
2323

24-
define('SOLR_EXTENSION_VERSION', '2.6.0');
24+
define('SOLR_EXTENSION_VERSION', '2.7.0');
2525

2626
/**
2727
* Returns the current version of the Apache Solr extension

package.xml

Lines changed: 70 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ https://github.com/php/pecl-search_engine-solr
3838
<email>[email protected]</email>
3939
<active>yes</active>
4040
</lead>
41-
<date>2022-11-09</date>
41+
<date>2024-01-11</date>
4242
<version>
43-
<release>2.6.0</release>
44-
<api>2.6.0</api>
43+
<release>2.7.0</release>
44+
<api>2.7.0</api>
4545
</version>
4646
<stability>
4747
<release>stable</release>
@@ -52,8 +52,25 @@ https://github.com/php/pecl-search_engine-solr
5252
<!-- Notes for the latest release -->
5353
<notes>
5454
<![CDATA[
55-
- PHP 8.1 compatible
56-
- PHP 8.2 compatible
55+
Features:
56+
- Support Highlight Query (#28)
57+
- Support PHP-8.3
58+
59+
API Changes:
60+
- Added SolrQuery SolrQuery::setHighlightQuery(string $q)
61+
- Added string SolrQuery::getHighlightQuery()
62+
63+
Bug Fixes:
64+
- Fix parsed parameter types (#37)
65+
- Fix compile error: libcurl on linux multi-arch support (#46)
66+
- Fix SegFault in SolrClient::optimize() (debug mode)
67+
- Fix Missing Windows DLLs (#51) / available on github releases now
68+
- Fix curl checks for PHP 7.4+, use PKG_CONFIG (remicollet)
69+
70+
Internals:
71+
- ci: windows tests (#51)
72+
- parse_int macros
73+
5774
]]>
5875
</notes>
5976

@@ -124,6 +141,8 @@ https://github.com/php/pecl-search_engine-solr
124141
<file role="test" name="skip.if.server_not_configured.inc" />
125142
<file role="test" name="test.config.inc" />
126143
<file role="test" name="bootstrap.inc" />
144+
<file role="test" name="000.solr_int_arg.phpt" />
145+
<file role="test" name="000.solr_int_arg_strict.phpt" />
127146
<file role="test" name="000.solrclient_ping.phpt" />
128147
<file role="test" name="000.solr_server_compat.phpt" />
129148
<file role="test"
@@ -330,6 +349,7 @@ https://github.com/php/pecl-search_engine-solr
330349
<file role="test"
331350
name="201.solrextractrequest_serialize.phpt" />
332351
<file role="test" name="202.solrdocument_new_serialize.phpt" />
352+
<file role="test" name="203.solrquery_strict_types.phpt" />
333353
<file role="test" name="bug_59511_error.phpt" />
334354
<file role="test" name="bug_61836_error.phpt" />
335355
<file role="test" name="bug_67394.phpt" />
@@ -356,6 +376,14 @@ https://github.com/php/pecl-search_engine-solr
356376
<file role="test" name="sample_1.xlsx" />
357377
<file role="test" name="solr-word.pdf" />
358378
</dir> <!-- tests/files -->
379+
<dir name="docker">
380+
<file role="test" name="Dockerfile" />
381+
<dir name="collections">
382+
<file role="test" name="collection1.json" />
383+
<file role="test" name="metal_store.json" />
384+
</dir> <!-- tests/docker/collections -->
385+
</dir> <!-- tests/docker -->
386+
359387
</dir> <!-- tests -->
360388
<dir name="pecl-compat">
361389
<file role="src" name="compat.h" />
@@ -409,8 +437,8 @@ https://github.com/php/pecl-search_engine-solr
409437
<dependencies>
410438
<required>
411439
<php>
412-
<min>7.0</min>
413-
<max>8.2.99</max>
440+
<min>7.4.0</min>
441+
<max>8.3.99</max>
414442
</php>
415443
<pearinstaller>
416444
<min>1.4.0</min>
@@ -425,13 +453,45 @@ https://github.com/php/pecl-search_engine-solr
425453

426454
<!-- Configure options for source releases -->
427455
<extsrcrelease>
428-
<configureoption default="no"
429-
name="enable-solr-debug"
430-
prompt="Enable Solr Debugging (Compiles solr in debug mode)" />
431456
</extsrcrelease>
432457

433458
<!-- Changes to the extension should be tracked here -->
434459
<changelog>
460+
<release>
461+
<version>
462+
<release>2.7.0</release>
463+
<api>2.7.0</api>
464+
</version>
465+
<stability>
466+
<release>stable</release>
467+
<api>stable</api>
468+
</stability>
469+
<date>2024-01-11</date>
470+
<license uri="http://www.php.net/license">PHP License</license>
471+
<notes>
472+
<![CDATA[
473+
Features:
474+
- Support Highlight Query (#28)
475+
- Support PHP-8.3
476+
477+
API Changes:
478+
- Added SolrQuery SolrQuery::setHighlightQuery(string $q)
479+
- Added string SolrQuery::getHighlightQuery()
480+
481+
Bug Fixes:
482+
- Fix parsed parameter types (#37)
483+
- Fix compile error: libcurl on linux multi-arch support (#46)
484+
- Fix SegFault in SolrClient::optimize() (debug mode)
485+
- Fix Missing Windows DLLs (#51) / available on github releases now
486+
- Fix curl checks for PHP 7.4+, use PKG_CONFIG (remicollet)
487+
488+
Internals:
489+
- ci: windows tests (#51)
490+
- parse_int macros
491+
492+
]]>
493+
</notes>
494+
</release>
435495
<release>
436496
<version>
437497
<release>2.6.0</release>

src/php7/php_solr_version.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222
#define PHP_SOLR_VERSION_H
2323

2424
#define PHP_SOLR_MAJOR_VERSION 2
25-
#define PHP_SOLR_MINOR_VERSION 6
25+
#define PHP_SOLR_MINOR_VERSION 7
2626
#define PHP_SOLR_PATCH_VERSION 0
2727

2828
#define PHP_SOLR_RELEASE_VERSION PHP_SOLR_PATCH_VERSION
2929

30-
#define PHP_SOLR_VERSION "2.6.0"
30+
#define PHP_SOLR_VERSION "2.7.0"
3131
#define PHP_SOLR_DOTTED_VERSION PHP_SOLR_VERSION
3232

3333

0 commit comments

Comments
 (0)