3812753794

Build Type

push

github

Committed by twinh

Commit Message

refactor: `wei()->user()` 改为 `UserModel`

Run Details

1 of 1 new or added line in 1 file covered. (100.0%)

36 existing lines in 2 files now uncovered.

901 of 2262 relevant lines covered (39.83%)

19.49 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

66.67

/src/Model/ModelTrait.php

<?php

namespace Miaoxing\Plugin\Model;

use Miaoxing\Plugin\Resource\BaseResource;
use Wei\ModelTrait as BaseModelTrait;
use Wei\Ret;

trait ModelTrait
{
    use BaseModelTrait;

    /**
     * Returns the success result with model data
     *
     * @param array|string|BaseResource|mixed $merge
     * @return Ret
     * @svc
     */
    protected function toRet($merge = []): Ret
    {
        if (is_array($merge)) {
            $data = $merge;
        } elseif ($merge instanceof BaseResource) {
            $data = $merge->toArray($this);
        } elseif (is_subclass_of($merge, BaseResource::class)) {
            $data = $merge::toArray($this);
        } else {
            throw new \InvalidArgumentException(sprintf(
                'Expected argument of type array, instance of BaseResource, or subclass of BaseReource, "%s" given',
                is_object($merge) ? get_class($merge) : gettype($merge)
            ));
        }

        if ($this->coll) {
            return $this->collToRet($data);
        } else {
            return $this->suc($data + ['data' => $this])->setMetadata('model', $this);
        }
    }
}

1	<?php
2
3	namespace Miaoxing\Plugin\Model;
4
5	use Miaoxing\Plugin\Resource\BaseResource;
6	use Wei\ModelTrait as BaseModelTrait;
7	use Wei\Ret;
8
9	trait ModelTrait
10	{
11	use BaseModelTrait;
12
13	/**
14	* Returns the success result with model data
15	*
16	* @param array\|string\|BaseResource\|mixed $merge
17	* @return Ret
18	* @svc
19	*/
20	protected function toRet($merge = []): Ret
21	{
22	if (is_array($merge)) {	9✔
23	$data = $merge;	3✔
24	} elseif ($merge instanceof BaseResource) {	6✔
25	$data = $merge->toArray($this);	3✔
26	} elseif (is_subclass_of($merge, BaseResource::class)) {	3✔
27	$data = $merge::toArray($this);	3✔
28	} else {
UNCOV 29	throw new \InvalidArgumentException(sprintf(	×
UNCOV 30	'Expected argument of type array, instance of BaseResource, or subclass of BaseReource, "%s" given',	×
UNCOV 31	is_object($merge) ? get_class($merge) : gettype($merge)	×
32	));
33	}
34
35	if ($this->coll) {	9✔
UNCOV 36	return $this->collToRet($data);	×
37	} else {
38	return $this->suc($data + ['data' => $this])->setMetadata('model', $this);	9✔
39	}
40	}
41	}

miaoxing / plugin / 3812753794

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous