Skip to content

Commit 4aa59d2

Browse files
committed
Trim trailing whitespace
1 parent f2cea20 commit 4aa59d2

File tree

62 files changed

+224
-224
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+224
-224
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ addons:
1717
- libxml2-dev
1818
- libcurl4-gnutls-dev
1919
- lcov
20-
20+
2121
install:
2222
- gem install lcoveralls
2323

@@ -43,7 +43,7 @@ env:
4343
before_script:
4444
# build the matrix' PHP version
4545
- make -f travis/pecl/Makefile php
46-
# build the extension, the PECL variable expects the extension name
46+
# build the extension, the PECL variable expects the extension name
4747
# and optionally the soname and a specific version of the extension
4848
# separeated by double colon, e.g. PECL=myext:ext:1.7.5
4949
- make -f travis/pecl/Makefile ext PECL=solr
@@ -59,7 +59,7 @@ script:
5959
after_script:
6060
- lcov --no-checksum --directory . -f --capture --output-file coverage.info && lcov -f --remove coverage.info "/usr/*" -o coverage.info
6161
- lcoveralls -r .
62-
62+
6363
notifications:
6464
email:
6565

LICENSE

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
1-
--------------------------------------------------------------------
1+
--------------------------------------------------------------------
22
The PHP License, version 3.01
33
Copyright (c) 1999 - 2009 The PHP Group. All rights reserved.
4-
--------------------------------------------------------------------
4+
--------------------------------------------------------------------
55

66
Redistribution and use in source and binary forms, with or without
77
modification, is permitted provided that the following conditions
88
are met:
99

1010
1. Redistributions of source code must retain the above copyright
1111
notice, this list of conditions and the following disclaimer.
12-
12+
1313
2. Redistributions in binary form must reproduce the above copyright
1414
notice, this list of conditions and the following disclaimer in
1515
the documentation and/or other materials provided with the
1616
distribution.
17-
17+
1818
3. The name "PHP" must not be used to endorse or promote products
1919
derived from this software without prior written permission. For
2020
written permission, please contact [email protected].
21-
21+
2222
4. Products derived from this software may not be called "PHP", nor
2323
may "PHP" appear in their name, without prior written permission
2424
from [email protected]. You may indicate that your software works in
2525
conjunction with PHP by saying "Foo for PHP" instead of calling
2626
it "PHP Foo" or "phpfoo"
27-
27+
2828
5. The PHP Group may publish revised and/or new versions of the
2929
license from time to time. Each version will be given a
3030
distinguishing version number.
@@ -41,27 +41,27 @@ are met:
4141
"This product includes PHP software, freely available from
4242
<http://www.php.net/software/>".
4343

44-
THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND
44+
THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND
4545
ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
46-
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
46+
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
4747
PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE PHP
48-
DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
49-
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
50-
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
48+
DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
49+
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
50+
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
5151
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
5252
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
5353
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
5454
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
5555
OF THE POSSIBILITY OF SUCH DAMAGE.
5656

57-
--------------------------------------------------------------------
57+
--------------------------------------------------------------------
5858

5959
This software consists of voluntary contributions made by many
6060
individuals on behalf of the PHP Group.
6161

6262
The PHP Group can be contacted via Email at [email protected].
6363

64-
For more information on the PHP Group and the PHP project,
64+
For more information on the PHP Group and the PHP project,
6565
please see <http://www.php.net>.
6666

6767
PHP includes the Zend Engine, freely available at

README.ABOUT_SOLR_EXTENSION

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
================================================================================
22
Introducing the Solr PHP Extension
33
================================================================================
4-
The Solr extension is an extremely fast, light-weight, feature-rich library that
4+
The Solr extension is an extremely fast, light-weight, feature-rich library that
55
allows PHP developers to communicate effectively with Solr server instances.
66

77
There are tools to add documents and make updates to the solr server.
@@ -12,15 +12,15 @@ when searching for documents.
1212
There are also special objects that simplifies the sending of name-value requests
1313
to the server. This includes the SolrParams class and all its child classes.
1414

15-
The SolrClient object allows one to communicate with Solr containers that are
15+
The SolrClient object allows one to communicate with Solr containers that are
1616
behind proxy servers or that require HTTP Authentication to proceed.
1717

1818
The SolrClient constructor accepts options such as
19-
http authentication username and passwor, proxy server name, port, login and
19+
http authentication username and passwor, proxy server name, port, login and
2020
passwords etc.
2121

2222
Using an advanced http client like libcurl allows us to leverage the features
23-
available with the library. We can reuse the HTTP connections without having
23+
available with the library. We can reuse the HTTP connections without having
2424
to create a separate one for each request.
2525

2626
================================================================================
@@ -51,7 +51,7 @@ Each field is a SolrDocumentField object with the following public properties :
5151

5252
Custom Serialization
5353

54-
string SolrDocument::serialize(void) returns an XML document representing a
54+
string SolrDocument::serialize(void) returns an XML document representing a
5555
SolrDocument as shown below :
5656

5757
<?xml version="1.0" encoding="UTF-8"?>
@@ -107,16 +107,16 @@ C:12:"SolrDocument":679:{<?xml version="1.0" encoding="UTF-8"?>
107107
</solr_document>
108108
}
109109

110-
One of the items on my todo list is to create a response writer to return
110+
One of the items on my todo list is to create a response writer to return
111111
serialized SolrDocument objects instead of document arrays.
112112

113-
SolrDocument::unserialize(string $serialized) accepts an XML document
113+
SolrDocument::unserialize(string $serialized) accepts an XML document
114114
representing the SolrDocument object. It will the bring the object back to live.
115115

116-
The SolrDocument class also has the method SolrDocument::getInputDocument() to
116+
The SolrDocument class also has the method SolrDocument::getInputDocument() to
117117
allow one do get the SolrInputDocument version of a SolrDocument instance.
118118

119-
This method may be helpful if one needs to resubmit the document to the server to
119+
This method may be helpful if one needs to resubmit the document to the server to
120120
updates.
121121

122122
The Solr extension has the SolrQuery object (a child of SolrParams) that enables
@@ -137,7 +137,7 @@ read-only SolrObject instances whose properties can also be accessed as array
137137
keys in addition to being accessible directly via the object->member notation.
138138

139139
Having the properties accessible via object[member] notation is helpful in cases
140-
where the property name is not valid (contains dots and other characters not
140+
where the property name is not valid (contains dots and other characters not
141141
legal in php.
142142

143143
================================================================================
@@ -146,7 +146,7 @@ How to Report Bugs
146146

147147
Please report bugs to http://bugs.php.net
148148

149-
If you experience a crash due to a segmentation fault, please follow the instructions on the link below
149+
If you experience a crash due to a segmentation fault, please follow the instructions on the link below
150150
to get a gdb backtrace and then submit the trace in your bug report as well
151151

152152
http://bugs.php.net/bugs-generating-backtrace.php

README.CONTRIBUTORS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ Pierre-Alain Joye ([email protected])
2929
- Fine tuned and created the final version of the config.w32 script (291135)
3030
- Compiled and made available several versions of the .dll binaries for Windows.
3131
- Currently hosting the windows .dll binaries for the Apache Solr PECL extension.
32-
32+
3333
================================================================================
3434
Kalle Sommer Nielsen ([email protected])
3535
================================================================================
3636
- Significant refactoring of the config.w32 script for Windows (288890)
3737
- Corrected Windows C++ compiler bugs (288890)
38-
38+
3939
================================================================================
4040
Pierrick Charron ([email protected])
4141
================================================================================

README.INSTALLATION

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -78,19 +78,19 @@ This example assumes that the libxml2 and libcurl libraries were compiled from s
7878

7979
and installed using "/root/custom/software" as the --prefix
8080

81-
So the absolute path to the easy.h header file will be
81+
So the absolute path to the easy.h header file will be
8282

8383
/root/custom/software/include/curl/easy.h
8484

85-
And the absolute path to the libxml/parser.h header file wil be
85+
And the absolute path to the libxml/parser.h header file wil be
8686

8787
/root/custom/software/include/libxml2/libxml/parser.h
8888

8989
The absolute path to the xml2-config script will be /root/custom/software/bin/xml2-config
9090

9191
And the absolute path to the curl-config script will be /root/custom/software/bin/curl-config
9292

93-
Then you can pass libcurl prefix to the configure script for CURL and LIBXML respectively
93+
Then you can pass libcurl prefix to the configure script for CURL and LIBXML respectively
9494

9595
during the configuration phase as shown here :
9696

@@ -99,7 +99,7 @@ during the configuration phase as shown here :
9999
If you already have the latest versions of the libraries then the step listed in 4A alone is sufficient.
100100

101101
5. make && make install
102-
102+
103103
This should compile the code and install it in the extension_dir specified in the ini file.
104104

105105
Then open your php.ini file and add the following line to it
@@ -116,15 +116,15 @@ you will need to follow the following steps.
116116

117117
This will build the Solr extension statically into php.
118118

119-
After the installation is completed, you will have to restart your webserver for the changes to take effect.
119+
After the installation is completed, you will have to restart your webserver for the changes to take effect.
120120

121121
For CLI only use, you do not have to restart your webserver.
122122

123123
================================================================================
124124
On Windows
125125
================================================================================
126126

127-
If you are using a pre-compiled dll, simply copy the php_solr.dll file
127+
If you are using a pre-compiled dll, simply copy the php_solr.dll file
128128
to your extension_dir specified in the ini file.
129129

130130
Then open your php.ini file and add the following line to it
@@ -134,8 +134,8 @@ extension=php_solr.dll
134134
Then restart your webserver. For CLI only, you do not have to restart your webserver.
135135

136136
If you are building from source, you will need to download the library dependencies
137-
for libxml and libcurl from the following link to the deps folder before
138-
running buildconf.bat
137+
for libxml and libcurl from the following link to the deps folder before
138+
running buildconf.bat
139139

140140
http://wiki.php.net/internals/windows/libs
141141

@@ -150,7 +150,7 @@ Windows DLLs are now available here
150150
http://downloads.php.net/pierre/
151151

152152
If you are building from source, you will need to download the library dependencies
153-
for libxml and libcurl from the following link to the deps folder before
153+
for libxml and libcurl from the following link to the deps folder before
154154
running buildconf.bat
155155

156156
The Apache Solr extension can be compiled statically or shared.
@@ -181,7 +181,7 @@ cd c:\php-sdk\
181181
bin\phpsdk_setvars.bat
182182
bin\phpsdk_buildtree.bat php53dev
183183

184-
7. Now extract the snapshot from Step 3 to C:\php-sdk\php53dev\vc9\x86 with your favourite unpacker so that the following directory gets created:
184+
7. Now extract the snapshot from Step 3 to C:\php-sdk\php53dev\vc9\x86 with your favourite unpacker so that the following directory gets created:
185185

186186
C:\php-sdk\php53dev\vc9\x86\php5.3-xyz
187187

@@ -227,7 +227,7 @@ How to Report Bugs
227227

228228
Please report bugs to [email protected]
229229

230-
You can also register bugs here
230+
You can also register bugs here
231231

232232
http://pecl.php.net/bugs/report.php?package=solr
233233

README.MEMORY_ALLOCATION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ during the insert process.
4646
It will also call the destructor function if a valid one was passed when the
4747
HashTable was initialized with zend_hash_init().
4848

49-
In the extension, I have used the p* version of the memory allocation functions
49+
In the extension, I have used the p* version of the memory allocation functions
5050
to allow me toggle if there is any need to do so in the future. This will prevent
5151
a massive search and replace effort.
5252

53-
For all the HashTables, I set the intial size to 8 to reduce the looping when
53+
For all the HashTables, I set the intial size to 8 to reduce the looping when
5454
zend_hash_init() is setting up the HashTable pointer to use.
5555

5656

README.RELEASE_CHECKLIST

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ svn co http://svn.php.net/repository/pecl/solr/trunk pecl-solr
88

99
cd pecl-solr
1010

11-
phpize
11+
phpize
1212

1313
./configure
1414

15-
make
15+
make
1616

1717
make install
1818

README.SUBMITTING_CONTRIBUTIONS

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ experience very minimal defects during usage.
99

1010
New ideas, corrections, bug fixes, feature improvements are always welcome.
1111

12-
However, you must discuss any changes you are about to make to any of
12+
However, you must discuss any changes you are about to make to any of
1313
the source files prior to making or submitting such changes either in the
14-
PECL developers mailing list ([email protected]) or by contacting the
14+
PECL developers mailing list ([email protected]) or by contacting the
1515
current author(s) or maintainer(s) of this extension directly.
1616

1717
Test scripts should be included when making the submissions.
@@ -45,7 +45,7 @@ Checklist for making submissions
4545
web server error logs when you test your patch?
4646
- Did you build PHP for multi-threaded web servers.
4747
- Did you create test script for "make test"? (Recommended)
48-
- Did you check your patch is unified format and it does not
48+
- Did you check your patch is unified format and it does not
4949
contain white space changes?
5050
- Did you read the patch again?
51-
51+

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ Please make sure to install them before proceeding to the compilation process
3535
make
3636
make test
3737
sudo make install
38-
```
39-
38+
```
39+
4040
more details on README.INSTALLATION
4141

4242
Contributions
@@ -67,7 +67,7 @@ How to Report Bugs
6767

6868
Please report bugs to http://bugs.php.net
6969

70-
If you experience a crash due to a segmentation fault, please follow the instructions on the link below
70+
If you experience a crash due to a segmentation fault, please follow the instructions on the link below
7171
to get a gdb backtrace and then submit the trace in your bug report as well
7272

7373
http://bugs.php.net/bugs-generating-backtrace.php

TODO

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
Features and things to do in the library
66
================================================================================
77

8-
- Set up php.ini entries for default servlet values.
9-
8+
- Set up php.ini entries for default servlet values.
9+
1010
This will allow developers to set custom values for the servlets.
11-
11+
1212
- Ability to send custom requests to Solr (custom url, custom request contents)
1313

1414
- Ability to add files (pdf, office documents, etc)

0 commit comments

Comments
 (0)