Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Sign in
Toggle navigation
S
solarium
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
common
solarium
Commits
6497cf15
Commit
6497cf15
authored
Jun 11, 2017
by
Bas de Nooijer
Committed by
GitHub
Jun 11, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #513 from localheinz/fix/case
Fix: Case mismatch
parents
20435f32
e40a01fa
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
16 additions
and
16 deletions
+16
-16
library/Solarium/Plugin/BufferedAdd/BufferedAdd.php
library/Solarium/Plugin/BufferedAdd/BufferedAdd.php
+2
-2
library/Solarium/Plugin/CustomizeRequest/CustomizeRequest.php
...ary/Solarium/Plugin/CustomizeRequest/CustomizeRequest.php
+1
-1
library/Solarium/QueryType/Select/RequestBuilder/Component/DisMax.php
...rium/QueryType/Select/RequestBuilder/Component/DisMax.php
+1
-1
library/Solarium/QueryType/Select/RequestBuilder/Component/EdisMax.php
...ium/QueryType/Select/RequestBuilder/Component/EdisMax.php
+1
-1
library/Solarium/Support/DataFixtures/Loader.php
library/Solarium/Support/DataFixtures/Loader.php
+1
-1
tests/Solarium/Tests/QueryType/Select/Query/Component/Facet/FieldTest.php
...ests/QueryType/Select/Query/Component/Facet/FieldTest.php
+2
-2
tests/Solarium/Tests/QueryType/Select/Query/Component/Facet/PivotTest.php
...ests/QueryType/Select/Query/Component/Facet/PivotTest.php
+1
-1
tests/Solarium/Tests/QueryType/Select/Query/Component/FacetSetTest.php
...m/Tests/QueryType/Select/Query/Component/FacetSetTest.php
+3
-3
tests/Solarium/Tests/QueryType/Select/Query/Component/Highlighting/FieldTest.php
...eryType/Select/Query/Component/Highlighting/FieldTest.php
+1
-1
tests/Solarium/Tests/QueryType/Select/Query/Component/Highlighting/HighlightingTest.php
.../Select/Query/Component/Highlighting/HighlightingTest.php
+1
-1
tests/Solarium/Tests/QueryType/Select/RequestBuilder/RequestBuilderTest.php
...ts/QueryType/Select/RequestBuilder/RequestBuilderTest.php
+1
-1
tests/Solarium/Tests/QueryType/Update/Query/Command/AddTest.php
...Solarium/Tests/QueryType/Update/Query/Command/AddTest.php
+1
-1
No files found.
library/Solarium/Plugin/BufferedAdd/BufferedAdd.php
View file @
6497cf15
...
@@ -223,7 +223,7 @@ class BufferedAdd extends AbstractPlugin
...
@@ -223,7 +223,7 @@ class BufferedAdd extends AbstractPlugin
$this
->
client
->
getEventDispatcher
()
->
dispatch
(
Events
::
PRE_FLUSH
,
$event
);
$this
->
client
->
getEventDispatcher
()
->
dispatch
(
Events
::
PRE_FLUSH
,
$event
);
$this
->
updateQuery
->
addDocuments
(
$event
->
getBuffer
(),
$event
->
getOverwrite
(),
$event
->
getCommitWithin
());
$this
->
updateQuery
->
addDocuments
(
$event
->
getBuffer
(),
$event
->
getOverwrite
(),
$event
->
getCommitWithin
());
$result
=
$this
->
client
->
update
(
$this
->
updateQuery
,
$this
->
getEnd
p
oint
());
$result
=
$this
->
client
->
update
(
$this
->
updateQuery
,
$this
->
getEnd
P
oint
());
$this
->
clear
();
$this
->
clear
();
$event
=
new
PostFlushEvent
(
$result
);
$event
=
new
PostFlushEvent
(
$result
);
...
@@ -251,7 +251,7 @@ class BufferedAdd extends AbstractPlugin
...
@@ -251,7 +251,7 @@ class BufferedAdd extends AbstractPlugin
$this
->
updateQuery
->
addDocuments
(
$this
->
buffer
,
$event
->
getOverwrite
());
$this
->
updateQuery
->
addDocuments
(
$this
->
buffer
,
$event
->
getOverwrite
());
$this
->
updateQuery
->
addCommit
(
$event
->
getSoftCommit
(),
$event
->
getWaitSearcher
(),
$event
->
getExpungeDeletes
());
$this
->
updateQuery
->
addCommit
(
$event
->
getSoftCommit
(),
$event
->
getWaitSearcher
(),
$event
->
getExpungeDeletes
());
$result
=
$this
->
client
->
update
(
$this
->
updateQuery
,
$this
->
getEnd
p
oint
());
$result
=
$this
->
client
->
update
(
$this
->
updateQuery
,
$this
->
getEnd
P
oint
());
$this
->
clear
();
$this
->
clear
();
$event
=
new
PostCommitEvent
(
$result
);
$event
=
new
PostCommitEvent
(
$result
);
...
...
library/Solarium/Plugin/CustomizeRequest/CustomizeRequest.php
View file @
6497cf15
...
@@ -44,7 +44,7 @@ use Solarium\Core\Plugin\AbstractPlugin;
...
@@ -44,7 +44,7 @@ use Solarium\Core\Plugin\AbstractPlugin;
use
Solarium\Exception\InvalidArgumentException
;
use
Solarium\Exception\InvalidArgumentException
;
use
Solarium\Exception\RuntimeException
;
use
Solarium\Exception\RuntimeException
;
use
Solarium\Core\Event\Events
;
use
Solarium\Core\Event\Events
;
use
Solarium\Core\Event\
p
reExecuteRequest
as
preExecuteRequestEvent
;
use
Solarium\Core\Event\
P
reExecuteRequest
as
preExecuteRequestEvent
;
/**
/**
* CustomizeRequest plugin.
* CustomizeRequest plugin.
...
...
library/Solarium/QueryType/Select/RequestBuilder/Component/DisMax.php
View file @
6497cf15
...
@@ -40,7 +40,7 @@
...
@@ -40,7 +40,7 @@
namespace
Solarium\QueryType\Select\RequestBuilder\Component
;
namespace
Solarium\QueryType\Select\RequestBuilder\Component
;
use
Solarium\QueryType\Select\Query\Component\Dis
m
ax
as
DismaxComponent
;
use
Solarium\QueryType\Select\Query\Component\Dis
M
ax
as
DismaxComponent
;
use
Solarium\Core\Client\Request
;
use
Solarium\Core\Client\Request
;
/**
/**
...
...
library/Solarium/QueryType/Select/RequestBuilder/Component/EdisMax.php
View file @
6497cf15
...
@@ -40,7 +40,7 @@
...
@@ -40,7 +40,7 @@
namespace
Solarium\QueryType\Select\RequestBuilder\Component
;
namespace
Solarium\QueryType\Select\RequestBuilder\Component
;
use
Solarium\QueryType\Select\Query\Component\Edis
m
ax
as
EdismaxComponent
;
use
Solarium\QueryType\Select\Query\Component\Edis
M
ax
as
EdismaxComponent
;
use
Solarium\Core\Client\Request
;
use
Solarium\Core\Client\Request
;
/**
/**
...
...
library/Solarium/Support/DataFixtures/Loader.php
View file @
6497cf15
...
@@ -66,7 +66,7 @@ class Loader
...
@@ -66,7 +66,7 @@ class Loader
if
((
$fileName
=
$file
->
getBasename
(
$this
->
fileExtension
))
==
$file
->
getBasename
())
{
if
((
$fileName
=
$file
->
getBasename
(
$this
->
fileExtension
))
==
$file
->
getBasename
())
{
continue
;
continue
;
}
}
$sourceFile
=
realpath
(
$file
->
getPath
N
ame
());
$sourceFile
=
realpath
(
$file
->
getPath
n
ame
());
/** @noinspection PhpIncludeInspection */
/** @noinspection PhpIncludeInspection */
require_once
$sourceFile
;
require_once
$sourceFile
;
$includedFiles
[]
=
$sourceFile
;
$includedFiles
[]
=
$sourceFile
;
...
...
tests/Solarium/Tests/QueryType/Select/Query/Component/Facet/FieldTest.php
View file @
6497cf15
...
@@ -117,8 +117,8 @@ class FieldTest extends \PHPUnit_Framework_TestCase
...
@@ -117,8 +117,8 @@ class FieldTest extends \PHPUnit_Framework_TestCase
public
function
testSetAndGetMinCount
()
public
function
testSetAndGetMinCount
()
{
{
$this
->
facet
->
setMin
c
ount
(
100
);
$this
->
facet
->
setMin
C
ount
(
100
);
$this
->
assertEquals
(
100
,
$this
->
facet
->
getMin
c
ount
());
$this
->
assertEquals
(
100
,
$this
->
facet
->
getMin
C
ount
());
}
}
public
function
testSetAndGetMissing
()
public
function
testSetAndGetMissing
()
...
...
tests/Solarium/Tests/QueryType/Select/Query/Component/Facet/PivotTest.php
View file @
6497cf15
...
@@ -157,7 +157,7 @@ class PivotTest extends \PHPUnit_Framework_TestCase
...
@@ -157,7 +157,7 @@ class PivotTest extends \PHPUnit_Framework_TestCase
$this
->
facet
->
clearStats
();
$this
->
facet
->
clearStats
();
$this
->
facet
->
addStats
(
array
(
'stat1'
,
'stat2'
));
$this
->
facet
->
addStats
(
array
(
'stat1'
,
'stat2'
));
$this
->
facet
->
removeStat
(
'stat1'
);
$this
->
facet
->
removeStat
(
'stat1'
);
$this
->
assertEquals
(
array
(
'stat2'
),
$this
->
facet
->
get
s
tats
());
$this
->
assertEquals
(
array
(
'stat2'
),
$this
->
facet
->
get
S
tats
());
}
}
public
function
testSetStats
()
public
function
testSetStats
()
...
...
tests/Solarium/Tests/QueryType/Select/Query/Component/FacetSetTest.php
View file @
6497cf15
...
@@ -69,7 +69,7 @@ class FacetSetTest extends \PHPUnit_Framework_TestCase
...
@@ -69,7 +69,7 @@ class FacetSetTest extends \PHPUnit_Framework_TestCase
$this
->
assertEquals
(
2
,
count
(
$facets
));
$this
->
assertEquals
(
2
,
count
(
$facets
));
$this
->
assertEquals
(
$options
[
'prefix'
],
$this
->
facetSet
->
getPrefix
());
$this
->
assertEquals
(
$options
[
'prefix'
],
$this
->
facetSet
->
getPrefix
());
$this
->
assertEquals
(
$options
[
'sort'
],
$this
->
facetSet
->
getSort
());
$this
->
assertEquals
(
$options
[
'sort'
],
$this
->
facetSet
->
getSort
());
$this
->
assertEquals
(
$options
[
'mincount'
],
$this
->
facetSet
->
getMin
c
ount
());
$this
->
assertEquals
(
$options
[
'mincount'
],
$this
->
facetSet
->
getMin
C
ount
());
$this
->
assertEquals
(
$options
[
'missing'
],
$this
->
facetSet
->
getMissing
());
$this
->
assertEquals
(
$options
[
'missing'
],
$this
->
facetSet
->
getMissing
());
$this
->
assertEquals
(
$options
[
'extractfromresponse'
],
$this
->
facetSet
->
getExtractFromResponse
());
$this
->
assertEquals
(
$options
[
'extractfromresponse'
],
$this
->
facetSet
->
getExtractFromResponse
());
$this
->
assertEquals
(
$options
[
'contains'
],
$this
->
facetSet
->
getContains
());
$this
->
assertEquals
(
$options
[
'contains'
],
$this
->
facetSet
->
getContains
());
...
@@ -117,8 +117,8 @@ class FacetSetTest extends \PHPUnit_Framework_TestCase
...
@@ -117,8 +117,8 @@ class FacetSetTest extends \PHPUnit_Framework_TestCase
public
function
testSetAndGetMinCount
()
public
function
testSetAndGetMinCount
()
{
{
$this
->
facetSet
->
setMin
c
ount
(
100
);
$this
->
facetSet
->
setMin
C
ount
(
100
);
$this
->
assertEquals
(
100
,
$this
->
facetSet
->
getMin
c
ount
());
$this
->
assertEquals
(
100
,
$this
->
facetSet
->
getMin
C
ount
());
}
}
public
function
testSetAndGetMissing
()
public
function
testSetAndGetMissing
()
...
...
tests/Solarium/Tests/QueryType/Select/Query/Component/Highlighting/FieldTest.php
View file @
6497cf15
...
@@ -101,7 +101,7 @@ class FieldTest extends \PHPUnit_Framework_TestCase
...
@@ -101,7 +101,7 @@ class FieldTest extends \PHPUnit_Framework_TestCase
public
function
testSetAndGetFragSize
()
public
function
testSetAndGetFragSize
()
{
{
$value
=
20
;
$value
=
20
;
$this
->
fld
->
setFrag
s
ize
(
$value
);
$this
->
fld
->
setFrag
S
ize
(
$value
);
$this
->
assertEquals
(
$this
->
assertEquals
(
$value
,
$value
,
...
...
tests/Solarium/Tests/QueryType/Select/Query/Component/Highlighting/HighlightingTest.php
View file @
6497cf15
...
@@ -294,7 +294,7 @@ class HighlightingTest extends \PHPUnit_Framework_TestCase
...
@@ -294,7 +294,7 @@ class HighlightingTest extends \PHPUnit_Framework_TestCase
public
function
testSetAndGetFragSize
()
public
function
testSetAndGetFragSize
()
{
{
$value
=
20
;
$value
=
20
;
$this
->
hlt
->
setFrag
s
ize
(
$value
);
$this
->
hlt
->
setFrag
S
ize
(
$value
);
$this
->
assertEquals
(
$this
->
assertEquals
(
$value
,
$value
,
...
...
tests/Solarium/Tests/QueryType/Select/RequestBuilder/RequestBuilderTest.php
View file @
6497cf15
...
@@ -163,7 +163,7 @@ class RequestBuilderTest extends \PHPUnit_Framework_TestCase
...
@@ -163,7 +163,7 @@ class RequestBuilderTest extends \PHPUnit_Framework_TestCase
public
function
testWithEdismaxComponent
()
public
function
testWithEdismaxComponent
()
{
{
$this
->
query
->
getE
d
isMax
();
$this
->
query
->
getE
D
isMax
();
$request
=
$this
->
builder
->
build
(
$this
->
query
);
$request
=
$this
->
builder
->
build
(
$this
->
query
);
$this
->
assertEquals
(
$this
->
assertEquals
(
...
...
tests/Solarium/Tests/QueryType/Update/Query/Command/AddTest.php
View file @
6497cf15
...
@@ -71,7 +71,7 @@ class AddTest extends \PHPUnit_Framework_TestCase
...
@@ -71,7 +71,7 @@ class AddTest extends \PHPUnit_Framework_TestCase
}
}
try
{
try
{
$doc
=
new
\
StdClass
()
;
$doc
=
new
\
stdClass
;
$this
->
command
->
addDocument
(
$doc
);
$this
->
command
->
addDocument
(
$doc
);
$this
->
fail
(
$this
->
fail
(
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment