Compare `d7ca56f ... +10 ... 258decd`

{
    public function printResult(array $count, $countTests = false)
    {
        if (class_exists('\\SebastianBergmann\\PHPLOC\\Log\\XML')) {
            $printer = new SebastianBergmann\PHPLOC\Log\XML();
        } elseif (class_exists('\\SebastianBergmann\\PHPLOC\\Log\\Xml')) {
        if (class_exists('\\SebastianBergmann\\PHPLOC\\Log\\Xml')) {
            $printer = new SebastianBergmann\PHPLOC\Log\Xml();
        } else {
            throw new BuildException('Not supported PHPLOC version used.');

@@ -61,79 +61,28 @@

     */
    public function init(): void
    {
        $this->setFormat(VisualizerTask::FORMAT_PNG);
        $this->setServer(VisualizerTask::SERVER);
        $this->checkHttpRequestLibrary();
        $this->checkPlantUmlLibrary();
        $this->checkXslExtension();
        $this->checkXmlExtension();
    }

    /**
     * Checks that `\HTTP_Request2` class is available
     *
     * Instead of checking that `pear/http_request2` library is loaded we only check `\HTTP_Request2` class availability
     */
    protected function checkHttpRequestLibrary()
    {
        $this->classExists('HTTP_Request2', "Please install 'pear/http_request2' library");
    }

    /**
     * Verifies that provided $class exists
     *
     * @param string $class Name of the class to verify
     * @param string $message Error message to display when class don't exists
     */
    protected function classExists(string $class, string $message): void
    {
        if (!class_exists($class)) {
            $this->log($message, Project::MSG_ERR);
            throw new BuildException($message);
        parent::init();
        if (!function_exists(\Jawira\PlantUml\encodep::class)) {
            $exceptionMessage = get_class($this) . ' requires "jawira/plantuml-encoding" library';
        }
    }

    /**
     * Checks that `encodep` function is available
     *
     * Instead of checking that `jawira/plantuml-encoding` library is loaded we only check 'encodep' function
     * availability
     */
    protected function checkPlantUmlLibrary()
    {
        $function = '\Jawira\PlantUml\encodep';
        $message = "Please install 'jawira/plantuml-encoding' library";

        if (!function_exists($function)) {
            $this->log($message, Project::MSG_ERR);
            throw new BuildException($message);
        if (!class_exists(XSLTProcessor::class)) {
            $exceptionMessage = get_class($this) . ' requires XSL extension';
        }
    }

    /**
     * Checks that `XSLTProcessor` class is available
     *
     * Instead of checking that XSL extension is loaded we only check `XSLTProcessor` class availability
     */
    protected function checkXslExtension(): void
    {
        $this->classExists('XSLTProcessor', 'Please install XSL extension');
    }

    /**
     * Checks that `SimpleXMLElement` class is available
     *
     * Instead of checking that SimpleXML extension is loaded we only check `SimpleXMLElement` class availability
     */
    protected function checkXmlExtension(): void
    {
        $this->classExists('SimpleXMLElement', 'Please install SimpleXML extension');
        if (!class_exists(SimpleXMLElement::class)) {
            $exceptionMessage = get_class($this) . ' requires SimpleXML extension';
        }
        if (isset($exceptionMessage)) {
            $this->log($exceptionMessage, Project::MSG_ERR);
            throw new BuildException($exceptionMessage);
        }
        $this->setFormat(VisualizerTask::FORMAT_PNG);
        $this->setServer(VisualizerTask::SERVER);
    }

    /**
     * The main entry point method.
     *
     * @throws \HTTP_Request2_Exception
     * @throws \GuzzleHttp\Exception\GuzzleException
     * @throws \IOException
     * @throws \NullPointerException
     */

@@ -342,7 +291,7 @@

     * @param string $format
     *
     * @return string
     * @throws \HTTP_Request2_Exception
     * @throws \GuzzleHttp\Exception\GuzzleException
     */
    protected function generateImage(string $pumlDiagram, string $format): string
    {

@@ -356,10 +305,10 @@

        $encodedPuml = encodep($pumlDiagram);
        $this->prepareImageUrl($format, $encodedPuml);

        $response = $this->request()->send();
        $response = $this->request();
        $this->processResponse($response); // used for status validation

        return $response->getBody();
        return $response->getBody()->getContents();
    }

    /**

@@ -20,6 +20,7 @@

use GuzzleHttp\Middleware;
use Psr\Http\Message\ResponseInterface;
use Symfony\Component\Console\Logger\ConsoleLogger;
use Symfony\Component\Console\Output\ConsoleOutput;

/**
 * A HTTP request task.

@@ -150,7 +151,7 @@

        }

        if ($this->verbose) {
            self::getHandlerStack()->push(Middleware::log(new ConsoleLogger(), new \GuzzleHttp\MessageFormatter()));
            self::getHandlerStack()->push(Middleware::log(new ConsoleLogger(new ConsoleOutput()), new \GuzzleHttp\MessageFormatter()));
        }

        return parent::request($options);

@@ -39,16 +39,16 @@


        switch ($type) {
            case "xml":
                include_once 'phing/tasks/ext/phploc/PHPLocXMLFormatter.php';
                $formatter = new PHPLocXMLFormatter();
                break;
            case "json":
                $formatter = new PHPLocJSONFormatter();
                break;
            case "csv":
                include_once 'phing/tasks/ext/phploc/PHPLocCSVFormatter.php';
                $formatter = new PHPLocCSVFormatter();
                break;
            case "txt":
            case "cli":
                include_once 'phing/tasks/ext/phploc/PHPLocTextFormatter.php';
                $formatter = new PHPLocTextFormatter();
                break;
            default:

@@ -35,7 +35,7 @@

    /**
     * @var array
     */
    protected $acceptedReportTypes = ['cli', 'txt', 'xml', 'csv'];
    protected $acceptedReportTypes = ['cli', 'txt', 'xml', 'csv', 'json'];

    /**
     * @var null

@@ -302,10 +302,10 @@


        if (count($this->filesToCheck) > 0) {
            foreach ($this->filesToCheck as $file) {
                $files[] = new SplFileInfo($file);
                $files[] = (new SplFileInfo($file))->getRealPath();
            }
        } elseif ($this->fileToCheck !== null) {
            $files = [new SplFileInfo($this->fileToCheck)];
            $files = [(new SplFileInfo($this->fileToCheck))->getRealPath()];
        }

        return $files;

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Learn more Showing 8 files with coverage changes found.

New file classes/phing/tasks/ext/phploc/PHPLocJSONFormatter.php

New

Loading file...

Changes in classes/phing/util/SourceFileScanner.php

-5

→

Loading file...

Changes in classes/phing/tasks/ext/phploc/PHPLocXMLFormatter.php

-1

→

Loading file...

Changes in classes/phing/tasks/ext/phploc/PHPLocFormatterFactory.php

-7

→

Loading file...

Changes in classes/phing/tasks/ext/phploc/PHPLocTask.php

-56

→

+56

Loading file...

Changes in classes/phing/tasks/ext/phploc/PHPLocCSVFormatter.php

-6

→

Loading file...

Changes in classes/phing/tasks/ext/phploc/AbstractPHPLocFormatter.php

-16

→

+13

Loading file...

Changes in classes/phing/tasks/ext/phploc/PHPLocFormatterElement.php

-16

→

+16

Loading file...

53.07% ø +0.58% 9306 -1

Link to migrated build

mrook

258decd

CI Passed

Hiding 10 contexual commits

+1 Files

-15

+124

-139

52.48% 0.00% ø 9307 0

Refs #1370 - remove reference to PEAR package

mrook

d7ca56f

CI Passed

Files		•	•	•	Complexity	Coverage
VisualizerTask.php	-10	-11	ø	+1	ø	^-2.30% 80.51%
Project Totals (477 files)	22,689	12,040	0	10,649	9306	53.07%

342	291		* @param string $format
343	292		*
344	293		* @return string
345		-	* @throws \HTTP_Request2_Exception
	294	+	* @throws \GuzzleHttp\Exception\GuzzleException
346	295		*/
347	296		protected function generateImage(string $pumlDiagram, string $format): string
348	297		{

356	305		$encodedPuml = encodep($pumlDiagram);
357	306		$this->prepareImageUrl($format, $encodedPuml);
358	307
359		-	$response = $this->request()->send();
	308	+	$response = $this->request();
360	309		$this->processResponse($response); // used for status validation
361	310
362		-	return $response->getBody();
	311	+	return $response->getBody()->getContents();
363	312		}
364	313
365	314		/**

150	151		}
151	152
152	153		if ($this->verbose) {
153		-	self::getHandlerStack()->push(Middleware::log(new ConsoleLogger(), new \GuzzleHttp\MessageFormatter()));
	154	+	self::getHandlerStack()->push(Middleware::log(new ConsoleLogger(new ConsoleOutput()), new \GuzzleHttp\MessageFormatter()));
154	155		}
155	156
156	157		return parent::request($options);

Navigation	Overlay
`t` Navigate files	`h` Toggle hits
`y` Change url to tip of branch	`m` Toggle misses
`b / v` Jump to prev/next hit line	`p` Toggle partial
`z / x` Jump to prev/next missed or partial line	`1..9` Toggle flags
`shift + o` Open current page in GitHub	`a` Toggle all on
`/ or ?` Show keyboard shortcuts dialog	`c` Toggle context lines or commits

Compare `d7ca56f ... +10 ... 258decd`

No flags found

Show failed CI and contexual commits `c`

12 Commits

25	25		{
26	26		public function printResult(array $count, $countTests = false)
27	27		{
28		-	if (class_exists('\\SebastianBergmann\\PHPLOC\\Log\\XML')) {
29		-	$printer = new SebastianBergmann\PHPLOC\Log\XML();
30		-	} elseif (class_exists('\\SebastianBergmann\\PHPLOC\\Log\\Xml')) {
	28	+	if (class_exists('\\SebastianBergmann\\PHPLOC\\Log\\Xml')) {
31	29		$printer = new SebastianBergmann\PHPLOC\Log\Xml();
32	30		} else {
33	31		throw new BuildException('Not supported PHPLOC version used.');

61	61		*/
62	62		public function init(): void
63	63		{
64		-	$this->setFormat(VisualizerTask::FORMAT_PNG);
65		-	$this->setServer(VisualizerTask::SERVER);
66		-	$this->checkHttpRequestLibrary();
67		-	$this->checkPlantUmlLibrary();
68		-	$this->checkXslExtension();
69		-	$this->checkXmlExtension();
70		-	}
71		-
72		-	/**
73		-	* Checks that `\HTTP_Request2` class is available
74		-	*
75		-	* Instead of checking that `pear/http_request2` library is loaded we only check `\HTTP_Request2` class availability
76		-	*/
77		-	protected function checkHttpRequestLibrary()
78		-	{
79		-	$this->classExists('HTTP_Request2', "Please install 'pear/http_request2' library");
80		-	}
81		-
82		-	/**
83		-	* Verifies that provided $class exists
84		-	*
85		-	* @param string $class Name of the class to verify
86		-	* @param string $message Error message to display when class don't exists
87		-	*/
88		-	protected function classExists(string $class, string $message): void
89		-	{
90		-	if (!class_exists($class)) {
91		-	$this->log($message, Project::MSG_ERR);
92		-	throw new BuildException($message);
	64	+	parent::init();
	65	+	if (!function_exists(\Jawira\PlantUml\encodep::class)) {
	66	+	$exceptionMessage = get_class($this) . ' requires "jawira/plantuml-encoding" library';
93	67		}
94		-	}
95		-
96		-	/**
97		-	* Checks that `encodep` function is available
98		-	*
99		-	* Instead of checking that `jawira/plantuml-encoding` library is loaded we only check 'encodep' function
100		-	* availability
101		-	*/
102		-	protected function checkPlantUmlLibrary()
103		-	{
104		-	$function = '\Jawira\PlantUml\encodep';
105		-	$message = "Please install 'jawira/plantuml-encoding' library";
106		-
107		-	if (!function_exists($function)) {
108		-	$this->log($message, Project::MSG_ERR);
109		-	throw new BuildException($message);
	68	+	if (!class_exists(XSLTProcessor::class)) {
	69	+	$exceptionMessage = get_class($this) . ' requires XSL extension';
110	70		}
111		-	}
112		-
113		-	/**
114		-	* Checks that `XSLTProcessor` class is available
115		-	*
116		-	* Instead of checking that XSL extension is loaded we only check `XSLTProcessor` class availability
117		-	*/
118		-	protected function checkXslExtension(): void
119		-	{
120		-	$this->classExists('XSLTProcessor', 'Please install XSL extension');
121		-	}
122		-
123		-	/**
124		-	* Checks that `SimpleXMLElement` class is available
125		-	*
126		-	* Instead of checking that SimpleXML extension is loaded we only check `SimpleXMLElement` class availability
127		-	*/
128		-	protected function checkXmlExtension(): void
129		-	{
130		-	$this->classExists('SimpleXMLElement', 'Please install SimpleXML extension');
	71	+	if (!class_exists(SimpleXMLElement::class)) {
	72	+	$exceptionMessage = get_class($this) . ' requires SimpleXML extension';
	73	+	}
	74	+	if (isset($exceptionMessage)) {
	75	+	$this->log($exceptionMessage, Project::MSG_ERR);
	76	+	throw new BuildException($exceptionMessage);
	77	+	}
	78	+	$this->setFormat(VisualizerTask::FORMAT_PNG);
	79	+	$this->setServer(VisualizerTask::SERVER);
131	80		}
132	81
133	82		/**
134	83		* The main entry point method.
135	84		*
136		-	* @throws \HTTP_Request2_Exception
	85	+	* @throws \GuzzleHttp\Exception\GuzzleException
137	86		* @throws \IOException
138	87		* @throws \NullPointerException
139	88		*/

20	20		use GuzzleHttp\Middleware;
21	21		use Psr\Http\Message\ResponseInterface;
22	22		use Symfony\Component\Console\Logger\ConsoleLogger;
	23	+	use Symfony\Component\Console\Output\ConsoleOutput;
23	24
24	25		/**
25	26		* A HTTP request task.

39	39
40	40		switch ($type) {
41	41		case "xml":
42		-	include_once 'phing/tasks/ext/phploc/PHPLocXMLFormatter.php';
43	42		$formatter = new PHPLocXMLFormatter();
44	43		break;
	44	+	case "json":
	45	+	$formatter = new PHPLocJSONFormatter();
	46	+	break;
45	47		case "csv":
46		-	include_once 'phing/tasks/ext/phploc/PHPLocCSVFormatter.php';
47	48		$formatter = new PHPLocCSVFormatter();
48	49		break;
49	50		case "txt":
50	51		case "cli":
51		-	include_once 'phing/tasks/ext/phploc/PHPLocTextFormatter.php';
52	52		$formatter = new PHPLocTextFormatter();
53	53		break;
54	54		default:

35	35		/**
36	36		* @var array
37	37		*/
38		-	protected $acceptedReportTypes = ['cli', 'txt', 'xml', 'csv'];
	38	+	protected $acceptedReportTypes = ['cli', 'txt', 'xml', 'csv', 'json'];
39	39
40	40		/**
41	41		* @var null

302	302
303	303		if (count($this->filesToCheck) > 0) {
304	304		foreach ($this->filesToCheck as $file) {
305		-	$files[] = new SplFileInfo($file);
	305	+	$files[] = (new SplFileInfo($file))->getRealPath();
306	306		}
307	307		} elseif ($this->fileToCheck !== null) {
308		-	$files = [new SplFileInfo($this->fileToCheck)];
	308	+	$files = [(new SplFileInfo($this->fileToCheck))->getRealPath()];
309	309		}
310	310
311	311		return $files;

Compare d7ca56f ... +10 ... 258decd

No flags found

Show failed CI and contexual commits c 12 Commits

Compare `d7ca56f ... +10 ... 258decd`

Show failed CI and contexual commits `c`

12 Commits