Test Setup Failed
Pull Request — master (#152)
by Christopher
03:59
created
src/POData/ObjectModel/ODataExpandedResult.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@
 block discarded – undo
31 31
      * @param \POData\ObjectModel\ODataEntry|null $Entry
32 32
      * @param \POData\ObjectModel\ODataFeed|null  $Feed
33 33
      */
34
-    public function __construct(ODataEntry $Entry = null,ODataFeed $Feed = null)
34
+    public function __construct(ODataEntry $Entry = null, ODataFeed $Feed = null)
35 35
     {
36 36
         $this->entry = $Entry;
37 37
         $this->feed = $Feed;
Please login to merge, or discard this patch.
src/POData/ObjectModel/ODataFeed.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
      * @var string
59 59
      */
60 60
     public $baseURI;
61
-=======
61
+=== === =
62 62
      * @return \POData\ObjectModel\ODataLink
63 63
      */
64 64
     public function getNextPageLink()
@@ -94,5 +94,5 @@  discard block
 block discarded – undo
94 94
     {
95 95
         $this->entries = $entries;
96 96
     }
97
->>>>>>> cleaned up doc comments, got tests passing, finalized yml.
97
+>> >> >> > cleaned up doc comments, got tests passing, finalized yml .
98 98
 }
Please login to merge, or discard this patch.
src/POData/ObjectModel/ODataProperty.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -39,6 +39,6 @@
 block discarded – undo
39 39
      */
40 40
     public function isNull()
41 41
     {
42
-        return null === $this->value ? true:null;
42
+        return null === $this->value ? true : null;
43 43
     }
44 44
 }
Please login to merge, or discard this patch.
src/POData/ObjectModel/ODataEntry.php 3 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -98,7 +98,7 @@
 block discarded – undo
98 98
      */
99 99
     public $baseURI;
100 100
 
101
-	public function atomContent(){
101
+    public function atomContent(){
102 102
 
103 103
     /**
104 104
      * @var AtomObjectModel\AtomContent
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -98,7 +98,7 @@
 block discarded – undo
98 98
      */
99 99
     public $baseURI;
100 100
 
101
-	public function atomContent(){
101
+	public function atomContent() {
102 102
 
103 103
     /**
104 104
      * @var AtomObjectModel\AtomContent
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -98,7 +98,8 @@
 block discarded – undo
98 98
      */
99 99
     public $baseURI;
100 100
 
101
-	public function atomContent(){
101
+	public function atomContent()
102
+	{
102 103
 
103 104
     /**
104 105
      * @var AtomObjectModel\AtomContent
Please login to merge, or discard this patch.