Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Docker-in-Docker (DinD) capabilities of public runners deactivated.
More info
Open sidebar
OpsPortal
lavoisiercli
Commits
dea40afb
Commit
dea40afb
authored
Oct 28, 2014
by
Olivier Lequeux
Browse files
sensio fixes
parent
c5d7b30f
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
20 additions
and
18 deletions
+20
-18
CHANGELOG.md
CHANGELOG.md
+3
-0
src/Lavoisier/Entries/Entries.php
src/Lavoisier/Entries/Entries.php
+4
-5
src/Lavoisier/Entries/EntriesInterface.php
src/Lavoisier/Entries/EntriesInterface.php
+3
-3
src/Lavoisier/Exceptions/CurlException.php
src/Lavoisier/Exceptions/CurlException.php
+1
-1
src/Lavoisier/Exceptions/HTTPStatusException.php
src/Lavoisier/Exceptions/HTTPStatusException.php
+1
-1
src/Lavoisier/Hydrators/CSVasXMLHydrator.php
src/Lavoisier/Hydrators/CSVasXMLHydrator.php
+1
-1
src/Lavoisier/Hydrators/DefaultHydrator.php
src/Lavoisier/Hydrators/DefaultHydrator.php
+1
-1
src/Lavoisier/Hydrators/EntriesHydrator.php
src/Lavoisier/Hydrators/EntriesHydrator.php
+3
-3
src/Lavoisier/Hydrators/StringHydrator.php
src/Lavoisier/Hydrators/StringHydrator.php
+1
-1
tests/EntriesTest.php
tests/EntriesTest.php
+2
-2
No files found.
CHANGELOG.md
0 → 100644
View file @
dea40afb
1.
1
*
Sensio insights fixes
\ No newline at end of file
src/Lavoisier/Entries/Entries.php
View file @
dea40afb
...
...
@@ -9,10 +9,9 @@ namespace Lavoisier\Entries;
*/
class
Entries
extends
\
ArrayObject
implements
I
Entries
class
Entries
extends
\
ArrayObject
implements
Entries
Interface
{
public
function
init
()
{
}
...
...
@@ -24,9 +23,9 @@ class Entries extends \ArrayObject implements IEntries
static
public
function
getXMLNS
(
$useLavoisierXMLNS
=
true
)
{
if
(
true
===
$useLavoisierXMLNS
)
{
return
I
Entries
::
XMLNS_
entries
;
return
Entries
Interface
::
XMLNS_
ENTRIES
;
}
else
{
return
I
Entries
::
XMLNS_ex_entries
;
return
Entries
Interface
::
XMLNS_EX_ENTRIES
;
}
}
...
...
@@ -92,4 +91,4 @@ class Entries extends \ArrayObject implements IEntries
return
$this
[
$name
];
}
}
\ No newline at end of file
}
src/Lavoisier/Entries/
I
Entries.php
→
src/Lavoisier/Entries/Entries
Interface
.php
View file @
dea40afb
...
...
@@ -4,12 +4,12 @@ namespace Lavoisier\Entries;
/**
* @author Olivier LEQUEUX
*/
interface
I
Entries
{
interface
Entries
Interface
{
// original simple entries/entry Lavoisier xsd (it's a subset of the following one)
const
XMLNS_
entries
=
"http://software.in2p3.fr/lavoisier/entries.xsd"
;
const
XMLNS_
ENTRIES
=
"http://software.in2p3.fr/lavoisier/entries.xsd"
;
// extended recursive entries/entries/.../entries/entry lavoisiercli xsd
const
XMLNS_
ex_entries
=
"https://gitlab.in2p3.fr/opsportal/lavoisiercli/raw/master/resources/ex_entries.xsd"
;
const
XMLNS_
EX_ENTRIES
=
"https://gitlab.in2p3.fr/opsportal/lavoisiercli/raw/master/resources/ex_entries.xsd"
;
function
init
();
...
...
src/Lavoisier/Exceptions/CurlException.php
View file @
dea40afb
...
...
@@ -15,4 +15,4 @@ class CurlLException extends \Exception
}
}
\ No newline at end of file
}
src/Lavoisier/Exceptions/HTTPStatusException.php
View file @
dea40afb
...
...
@@ -31,4 +31,4 @@ class HTTPStatusException extends \Exception
}
}
\ No newline at end of file
}
src/Lavoisier/Hydrators/CSVasXMLHydrator.php
View file @
dea40afb
...
...
@@ -29,4 +29,4 @@ class CSVasXMLHydrator implements IHydrator
return
$result
;
}
}
\ No newline at end of file
}
src/Lavoisier/Hydrators/DefaultHydrator.php
View file @
dea40afb
...
...
@@ -8,4 +8,4 @@ class DefaultHydrator implements IHydrator{
return
$str
;
}
}
\ No newline at end of file
}
src/Lavoisier/Hydrators/EntriesHydrator.php
View file @
dea40afb
...
...
@@ -2,7 +2,7 @@
namespace
Lavoisier\Hydrators
;
use
\
Lavoisier\Entries\
I
Entries
;
use
\
Lavoisier\Entries\Entries
Interface
;
class
EntriesHydrator
implements
IHydrator
{
...
...
@@ -61,7 +61,7 @@ class EntriesHydrator implements IHydrator
}
}
public
function
sxiToArray
(
$sxi
,
I
Entries
$a
)
public
function
sxiToArray
(
$sxi
,
Entries
Interface
$a
)
{
for
(
$sxi
->
rewind
();
$sxi
->
valid
();
$sxi
->
next
())
{
$key
=
$this
->
getAttributeKey
(
$sxi
,
$a
);
...
...
@@ -109,4 +109,4 @@ class EntriesHydrator implements IHydrator
return
$key
;
}
}
\ No newline at end of file
}
src/Lavoisier/Hydrators/StringHydrator.php
View file @
dea40afb
...
...
@@ -12,4 +12,4 @@ class StringHydrator implements IHydrator{
}
return
(
strval
(
$sxObject
->
entry
));
}
}
\ No newline at end of file
}
tests/EntriesTest.php
View file @
dea40afb
...
...
@@ -44,10 +44,10 @@ class EntriesTest extends \PHPUnit_Framework_TestCase
public
function
getXMLNStest
()
{
$this
->
assertEquals
(
"http://software.in2p3.fr/lavoisier/entries.xsd"
,
Entries
::
getXMLNS
());
$this
->
assertEquals
(
"http://software.in2p3.fr/lavoisier/entries.xsd"
,
Entries
Interface
::
getXMLNS
());
$this
->
assertEquals
(
"https://gitlab.in2p3.fr/opsportal/lavoisiercli/raw/master/resources/ex_entries.xsd"
,
Entries
::
getXMLNS
(
true
)
Entries
Interface
::
getXMLNS
(
true
)
);
}
...
...
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