Inspection of "Fix merge conflicts." - zachleigh/larafolio - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — dev ( ace4ec...6a93ce )

by Zach

created 2017-02-03 00:27 UTC

Status

Doc Comments +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -41,7 +41,7 @@
 block discarded – undo
      *
      * @param string $name Name of text block to get.
      *
-     * @return Larafolio\Models\TextBlock|null
+     * @return \Illuminate\Database\Eloquent\Model|null
      */
     public function block($name)
     {

Please login to merge, or discard this patch.

src/Models/ContentTraits/HasImages.php 1 patch

Doc Comments +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -41,7 +41,7 @@
 block discarded – undo
      *
      * @param string $name Name of image to get.
      *
-     * @return Larafolio\Models\Image|null
+     * @return \Illuminate\Database\Eloquent\Model|null
      */
     public function image($name)
     {

Please login to merge, or discard this patch.

src/Models/ContentTraits/HasLinks.php 1 patch

Doc Comments +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -41,7 +41,7 @@
 block discarded – undo
      *
      * @param string $name Name of link to get.
      *
-     * @return Larafolio\Models\Link|null
+     * @return \Illuminate\Database\Eloquent\Model|null
      */
     public function link($name)
     {

Please login to merge, or discard this patch.

src/Models/ManagesPortfolio.php 1 patch

Doc Comments +23 added lines, -23 removed lines patch added patch discarded remove patch

@@ -14,10 +14,10 @@  discard block
 block discarded – undo
     /**
      * Add a blocks and links to model.
      *
-     * @param Larafolio\Models\HasContent $model Model to add extras to.
+     * @param HasContent $model Model to add extras to.
      * @param array                       $data  Array of posted user data.
      *
-     * @return Larafolio\Models\HasContent
+     * @return HasContent
      */
     protected function addModelExtras(HasContent $model, array $data)
     {
@@ -35,10 +35,10 @@  discard block
 block discarded – undo
     /**
      * Update a HasContent model and its children.
      *
-     * @param Larafolio\Models\HasContent $model Model to update.
+     * @param HasContent $model Model to update.
      * @param array                       $data  Array of posted user data.
      *
-     * @return Larafolio\Models\HasContent
+     * @return HasContent
      */
     protected function updateModel(HasContent $model, array $data)
     {
@@ -54,9 +54,9 @@  discard block
 block discarded – undo
     /**
      * Permanently delete a model.
      *
-     * @param Larafolio\Models\HasContent $model Model to delete.
+     * @param HasContent $model Model to delete.
      *
-     * @return bool
+     * @return boolean|null
      */
     protected function purgeModel(HasContent $model)
     {
@@ -89,10 +89,10 @@  discard block
 block discarded – undo
     /**
      * Add a text block to a model.
      *
-     * @param Larafolio\Models\HasContent $model     Model to add text block to.
+     * @param HasContent $model     Model to add text block to.
      * @param array                       $blockData Array of text block data.
      *
-     * @return Larafolio\Models\HasContent
+     * @return Model
      */
     public function addBlockToModel(HasContent $model, array $blockData)
     {
@@ -102,10 +102,10 @@  discard block
 block discarded – undo
     /**
      * Update a text block.
      *
-     * @param Larafolio\Models\TextBlock $textBlock Text block to update.
+     * @param TextBlock $textBlock Text block to update.
      * @param array                      $blockData Array of text block data.
      *
-     * @return Larafolio\Models\TextBlock
+     * @return TextBlock
      */
     public function updateTextBlock(TextBlock $textBlock, array $blockData)
     {
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
     /**
      * Update model text blocks by adding new ones and updating existing ones.
      *
-     * @param Larafolio\Models\HasContent $model Model that blocks belong to.
+     * @param HasContent $model Model that blocks belong to.
      * @param array                       $data  Array of model information.
      */
     public function updateAllTextBlocks(HasContent $model, array $data)
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
     /**
      * Remove a text block from a model.
      *
-     * @param Larafolio\Models\TextBlock $textBlock The text block to delete.
+     * @param TextBlock $textBlock The text block to delete.
      *
      * @return bool|null
      */
@@ -150,10 +150,10 @@  discard block
 block discarded – undo
     /**
      * Add image to a model.
      *
-     * @param Larafolio\Models\HasContent $model     Model to add image to.
+     * @param HasContent $model     Model to add image to.
      * @param array                       $imageData Array of image infomation.
      *
-     * @return Larafolio\Models\HasContent
+     * @return Model
      */
     public function addImageToModel(HasContent $model, array $imageData)
     {
@@ -163,10 +163,10 @@  discard block
 block discarded – undo
     /**
      * Update image name and caption.
      *
-     * @param Larafolio\Models\Image $image     Image to update.
+     * @param Image $image     Image to update.
      * @param array                  $imageData Array of inmage information.
      *
-     * @return Larafolio\Models\Image
+     * @return Image
      */
     public function updateImageInfo(Image $image, array $imageData)
     {
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
     /**
      * Remove image from storage and delete database info.
      *
-     * @param Larafolio\Models\Image $image Image to remove.
+     * @param Image $image Image to remove.
      *
      * @return bool|null
      */
@@ -192,7 +192,7 @@  discard block
 block discarded – undo
     /**
      * Add a link to a model.
      *
-     * @param Larafolio\Models\HasContent $model    Model to add link to.
+     * @param HasContent $model    Model to add link to.
      * @param array                       $linkData Array of link info.
      */
     public function addLinkToModel(HasContent $model, array $linkData)
@@ -203,10 +203,10 @@  discard block
 block discarded – undo
     /**
      * Update a link.
      *
-     * @param Larafolio\Models\Link $link     Link to update.
+     * @param Link $link     Link to update.
      * @param array                 $linkData Array of link data.
      *
-     * @return Larafolio\Models\Link
+     * @return Link
      */
     public function updateLink(Link $link, array $linkData)
     {
@@ -218,7 +218,7 @@  discard block
 block discarded – undo
     /**
      * Update model links by adding new ones and updating existing ones.
      *
-     * @param Larafolio\Models\HasContent $model Model that links belong to.
+     * @param HasContent $model Model that links belong to.
      * @param array                       $data  Array of model information.
      */
     public function updateAllLinks(HasContent $model, array $data)
@@ -239,7 +239,7 @@  discard block
 block discarded – undo
     /**
      * Remove link from a model.
      *
-     * @param Larafolio\Models\Link $link Link to remove.
+     * @param Link $link Link to remove.
      *
      * @return bool|null
      */
@@ -251,7 +251,7 @@  discard block
 block discarded – undo
     /**
      * Update content associated with model.
      *
-     * @param Larafolio\Models\HasContent $model          Model associated with content.
+     * @param HasContent $model          Model associated with content.
      * @param string                      $type           Type of model.
      * @param array                       $data           user posted data.
      * @param callable                    $updateCallback Callback to update the content.

Please login to merge, or discard this patch.

src/Models/UserTraits/ManagesPages.php 1 patch

Doc Comments +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -10,7 +10,7 @@  discard block
 block discarded – undo
     /**
      * Add a blocks and links to model.
      *
-     * @param Larafolio\Models\HasContent $model Model to add extras to.
+     * @param HasContent $model Model to add extras to.
      * @param array                       $data  Array of posted user data.
      *
      * @return Larafolio\Models\HasContent
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
     /**
      * Update a HasContent model and its children.
      *
-     * @param Larafolio\Models\HasContent $model Model to update.
+     * @param HasContent $model Model to update.
      * @param array                       $data  Array of posted user data.
      *
      * @return Larafolio\Models\HasContent
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
     /**
      * Permanently delete a model.
      *
-     * @param Larafolio\Models\HasContent $model Model to delete.
+     * @param HasContent $model Model to delete.
      *
      * @return bool
      */
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
     /**
      * Update a page.
      *
-     * @param Larafolio\Models\Page $page Page to update.
+     * @param Page $page Page to update.
      * @param array                 $data Array of data to save.
      *
      * @return Larafolio\Models\Page
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
     /**
      * Remove a page.
      *
-     * @param Larafolio\Models\Page $page Page to remove.
+     * @param Page $page Page to remove.
      *
      * @return bool|null
      */
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
     /**
      * Restore a soft deleted page.
      *
-     * @param Larafolio\Models\Page $page Page to restore.
+     * @param Page $page Page to restore.
      *
      * @return bool|null
      */
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
     /**
      * Hard delete a page from the portfolio.
      *
-     * @param Larafolio\Models\Page $page Page to purge.
+     * @param Page $page Page to purge.
      *
      * @return bool|null
      */

Please login to merge, or discard this patch.

src/Models/UserTraits/ManagesProjects.php 1 patch

Doc Comments +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -10,7 +10,7 @@  discard block
 block discarded – undo
     /**
      * Add a blocks and links to model.
      *
-     * @param Larafolio\Models\HasContent $model Model to add extras to.
+     * @param HasContent $model Model to add extras to.
      * @param array                       $data  Array of posted user data.
      *
      * @return Larafolio\Models\HasContent
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
     /**
      * Update a HasContent model and its children.
      *
-     * @param Larafolio\Models\HasContent $model Model to update.
+     * @param HasContent $model Model to update.
      * @param array                       $data  Array of posted user data.
      *
      * @return Larafolio\Models\HasContent
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
     /**
      * Permanently delete a model.
      *
-     * @param Larafolio\Models\HasContent $model Model to delete.
+     * @param HasContent $model Model to delete.
      *
      * @return bool
      */
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
     /**
      * Update a project in the portfolio.
      *
-     * @param Larafolio\Models\Project $project Project to update.
+     * @param Project $project Project to update.
      * @param array                    $data    Array of data to save.
      *
      * @return Larafolio\Models\Project
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
     /**
      * Remove a project from the portfolio.
      *
-     * @param Larafolio\Models\Project $project Project to remove.
+     * @param Project $project Project to remove.
      *
      * @return bool|null
      */
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
     /**
      * Restore a soft deleted project.
      *
-     * @param Larafolio\Models\Project $project Project to restore.
+     * @param Project $project Project to restore.
      *
      * @return bool|null
      */
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
     /**
      * Hard delete a project from the portfolio.
      *
-     * @param Larafolio\Models\Project $project Project to purge.
+     * @param Project $project Project to purge.
      *
      * @return bool|null
      */

Please login to merge, or discard this patch.

		@@ -41,7 +41,7 @@
		block discarded – undo
41	41	*
42	42	* @param string $name Name of text block to get.
43	43	*
44		- * @return Larafolio\Models\TextBlock\|null
	44	+ * @return \Illuminate\Database\Eloquent\Model\|null
45	45	*/
46	46	public function block($name)
47	47	{

		@@ -41,7 +41,7 @@
		block discarded – undo
41	41	*
42	42	* @param string $name Name of image to get.
43	43	*
44		- * @return Larafolio\Models\Image\|null
	44	+ * @return \Illuminate\Database\Eloquent\Model\|null
45	45	*/
46	46	public function image($name)
47	47	{

		@@ -41,7 +41,7 @@
		block discarded – undo
41	41	*
42	42	* @param string $name Name of link to get.
43	43	*
44		- * @return Larafolio\Models\Link\|null
	44	+ * @return \Illuminate\Database\Eloquent\Model\|null
45	45	*/
46	46	public function link($name)
47	47	{

		@@ -14,10 +14,10 @@ discard block
		block discarded – undo
14	14	/**
15	15	* Add a blocks and links to model.
16	16	*
17		- * @param Larafolio\Models\HasContent $model Model to add extras to.
	17	+ * @param HasContent $model Model to add extras to.
18	18	* @param array $data Array of posted user data.
19	19	*
20		- * @return Larafolio\Models\HasContent
	20	+ * @return HasContent
21	21	*/
22	22	protected function addModelExtras(HasContent $model, array $data)
23	23	{
		@@ -35,10 +35,10 @@ discard block
		block discarded – undo
35	35	/**
36	36	* Update a HasContent model and its children.
37	37	*
38		- * @param Larafolio\Models\HasContent $model Model to update.
	38	+ * @param HasContent $model Model to update.
39	39	* @param array $data Array of posted user data.
40	40	*
41		- * @return Larafolio\Models\HasContent
	41	+ * @return HasContent
42	42	*/
43	43	protected function updateModel(HasContent $model, array $data)
44	44	{
		@@ -54,9 +54,9 @@ discard block
		block discarded – undo
54	54	/**
55	55	* Permanently delete a model.
56	56	*
57		- * @param Larafolio\Models\HasContent $model Model to delete.
	57	+ * @param HasContent $model Model to delete.
58	58	*
59		- * @return bool
	59	+ * @return boolean\|null
60	60	*/
61	61	protected function purgeModel(HasContent $model)
62	62	{
		@@ -89,10 +89,10 @@ discard block
		block discarded – undo
89	89	/**
90	90	* Add a text block to a model.
91	91	*
92		- * @param Larafolio\Models\HasContent $model Model to add text block to.
	92	+ * @param HasContent $model Model to add text block to.
93	93	* @param array $blockData Array of text block data.
94	94	*
95		- * @return Larafolio\Models\HasContent
	95	+ * @return Model
96	96	*/
97	97	public function addBlockToModel(HasContent $model, array $blockData)
98	98	{
		@@ -102,10 +102,10 @@ discard block
		block discarded – undo
102	102	/**
103	103	* Update a text block.
104	104	*
105		- * @param Larafolio\Models\TextBlock $textBlock Text block to update.
	105	+ * @param TextBlock $textBlock Text block to update.
106	106	* @param array $blockData Array of text block data.
107	107	*
108		- * @return Larafolio\Models\TextBlock
	108	+ * @return TextBlock
109	109	*/
110	110	public function updateTextBlock(TextBlock $textBlock, array $blockData)
111	111	{
		@@ -117,7 +117,7 @@ discard block
		block discarded – undo
117	117	/**
118	118	* Update model text blocks by adding new ones and updating existing ones.
119	119	*
120		- * @param Larafolio\Models\HasContent $model Model that blocks belong to.
	120	+ * @param HasContent $model Model that blocks belong to.
121	121	* @param array $data Array of model information.
122	122	*/
123	123	public function updateAllTextBlocks(HasContent $model, array $data)
		@@ -138,7 +138,7 @@ discard block
		block discarded – undo
138	138	/**
139	139	* Remove a text block from a model.
140	140	*
141		- * @param Larafolio\Models\TextBlock $textBlock The text block to delete.
	141	+ * @param TextBlock $textBlock The text block to delete.
142	142	*
143	143	* @return bool\|null
144	144	*/
		@@ -150,10 +150,10 @@ discard block
		block discarded – undo
150	150	/**
151	151	* Add image to a model.
152	152	*
153		- * @param Larafolio\Models\HasContent $model Model to add image to.
	153	+ * @param HasContent $model Model to add image to.
154	154	* @param array $imageData Array of image infomation.
155	155	*
156		- * @return Larafolio\Models\HasContent
	156	+ * @return Model
157	157	*/
158	158	public function addImageToModel(HasContent $model, array $imageData)
159	159	{
		@@ -163,10 +163,10 @@ discard block
		block discarded – undo
163	163	/**
164	164	* Update image name and caption.
165	165	*
166		- * @param Larafolio\Models\Image $image Image to update.
	166	+ * @param Image $image Image to update.
167	167	* @param array $imageData Array of inmage information.
168	168	*
169		- * @return Larafolio\Models\Image
	169	+ * @return Image
170	170	*/
171	171	public function updateImageInfo(Image $image, array $imageData)
172	172	{
		@@ -178,7 +178,7 @@ discard block
		block discarded – undo
178	178	/**
179	179	* Remove image from storage and delete database info.
180	180	*
181		- * @param Larafolio\Models\Image $image Image to remove.
	181	+ * @param Image $image Image to remove.
182	182	*
183	183	* @return bool\|null
184	184	*/
		@@ -192,7 +192,7 @@ discard block
		block discarded – undo
192	192	/**
193	193	* Add a link to a model.
194	194	*
195		- * @param Larafolio\Models\HasContent $model Model to add link to.
	195	+ * @param HasContent $model Model to add link to.
196	196	* @param array $linkData Array of link info.
197	197	*/
198	198	public function addLinkToModel(HasContent $model, array $linkData)
		@@ -203,10 +203,10 @@ discard block
		block discarded – undo
203	203	/**
204	204	* Update a link.
205	205	*
206		- * @param Larafolio\Models\Link $link Link to update.
	206	+ * @param Link $link Link to update.
207	207	* @param array $linkData Array of link data.
208	208	*
209		- * @return Larafolio\Models\Link
	209	+ * @return Link
210	210	*/
211	211	public function updateLink(Link $link, array $linkData)
212	212	{
		@@ -218,7 +218,7 @@ discard block
		block discarded – undo
218	218	/**
219	219	* Update model links by adding new ones and updating existing ones.
220	220	*
221		- * @param Larafolio\Models\HasContent $model Model that links belong to.
	221	+ * @param HasContent $model Model that links belong to.
222	222	* @param array $data Array of model information.
223	223	*/
224	224	public function updateAllLinks(HasContent $model, array $data)
		@@ -239,7 +239,7 @@ discard block
		block discarded – undo
239	239	/**
240	240	* Remove link from a model.
241	241	*
242		- * @param Larafolio\Models\Link $link Link to remove.
	242	+ * @param Link $link Link to remove.
243	243	*
244	244	* @return bool\|null
245	245	*/
		@@ -251,7 +251,7 @@ discard block
		block discarded – undo
251	251	/**
252	252	* Update content associated with model.
253	253	*
254		- * @param Larafolio\Models\HasContent $model Model associated with content.
	254	+ * @param HasContent $model Model associated with content.
255	255	* @param string $type Type of model.
256	256	* @param array $data user posted data.
257	257	* @param callable $updateCallback Callback to update the content.

		@@ -10,7 +10,7 @@ discard block
		block discarded – undo
10	10	/**
11	11	* Add a blocks and links to model.
12	12	*
13		- * @param Larafolio\Models\HasContent $model Model to add extras to.
	13	+ * @param HasContent $model Model to add extras to.
14	14	* @param array $data Array of posted user data.
15	15	*
16	16	* @return Larafolio\Models\HasContent
		@@ -20,7 +20,7 @@ discard block
		block discarded – undo
20	20	/**
21	21	* Update a HasContent model and its children.
22	22	*
23		- * @param Larafolio\Models\HasContent $model Model to update.
	23	+ * @param HasContent $model Model to update.
24	24	* @param array $data Array of posted user data.
25	25	*
26	26	* @return Larafolio\Models\HasContent
		@@ -30,7 +30,7 @@ discard block
		block discarded – undo
30	30	/**
31	31	* Permanently delete a model.
32	32	*
33		- * @param Larafolio\Models\HasContent $model Model to delete.
	33	+ * @param HasContent $model Model to delete.
34	34	*
35	35	* @return bool
36	36	*/
		@@ -55,7 +55,7 @@ discard block
		block discarded – undo
55	55	/**
56	56	* Update a page.
57	57	*
58		- * @param Larafolio\Models\Page $page Page to update.
	58	+ * @param Page $page Page to update.
59	59	* @param array $data Array of data to save.
60	60	*
61	61	* @return Larafolio\Models\Page
		@@ -68,7 +68,7 @@ discard block
		block discarded – undo
68	68	/**
69	69	* Remove a page.
70	70	*
71		- * @param Larafolio\Models\Page $page Page to remove.
	71	+ * @param Page $page Page to remove.
72	72	*
73	73	* @return bool\|null
74	74	*/
		@@ -80,7 +80,7 @@ discard block
		block discarded – undo
80	80	/**
81	81	* Restore a soft deleted page.
82	82	*
83		- * @param Larafolio\Models\Page $page Page to restore.
	83	+ * @param Page $page Page to restore.
84	84	*
85	85	* @return bool\|null
86	86	*/
		@@ -94,7 +94,7 @@ discard block
		block discarded – undo
94	94	/**
95	95	* Hard delete a page from the portfolio.
96	96	*
97		- * @param Larafolio\Models\Page $page Page to purge.
	97	+ * @param Page $page Page to purge.
98	98	*
99	99	* @return bool\|null
100	100	*/

zachleigh / larafolio

Push — dev ( ace4ec...6a93ce )

Status

Category

Doc Comments +1 added lines, -1 removed lines patch added patch discarded remove patch

Doc Comments +1 added lines, -1 removed lines patch added patch discarded remove patch

Doc Comments +1 added lines, -1 removed lines patch added patch discarded remove patch

Doc Comments +23 added lines, -23 removed lines patch added patch discarded remove patch

Doc Comments +7 added lines, -7 removed lines patch added patch discarded remove patch

Doc Comments +7 added lines, -7 removed lines patch added patch discarded remove patch