Skip to content

Use PHP Console Color to version 1.0 #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 27, 2020
Merged

Use PHP Console Color to version 1.0 #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Usage
-------
```php
<?php
use JakubOnderka\PhpConsoleColor\ConsoleColor;
use PHP_Parallel_Lint\PhpConsoleColor\ConsoleColor;
use JakubOnderka\PhpConsoleHighlighter\Highlighter;

require __DIR__ . '/vendor/autoload.php';
Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"require": {
"php": ">=5.4.0",
"ext-tokenizer": "*",
"php-parallel-lint/php-console-color": "^0.2 || ^0.3"
"php-parallel-lint/php-console-color": "^1.0"
},
"require-dev": {
"phpunit/phpunit": "^4.8.36 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/snippet.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
use JakubOnderka\PhpConsoleColor\ConsoleColor;
use PHP_Parallel_Lint\PhpConsoleColor\ConsoleColor;
use JakubOnderka\PhpConsoleHighlighter\Highlighter;

require __DIR__ . '/../vendor/autoload.php';
Expand Down
2 changes: 1 addition & 1 deletion examples/whole_file.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
use JakubOnderka\PhpConsoleColor\ConsoleColor;
use PHP_Parallel_Lint\PhpConsoleColor\ConsoleColor;
use JakubOnderka\PhpConsoleHighlighter\Highlighter;

require __DIR__ . '/../vendor/autoload.php';
Expand Down
2 changes: 1 addition & 1 deletion examples/whole_file_line_numbers.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
use JakubOnderka\PhpConsoleColor\ConsoleColor;
use PHP_Parallel_Lint\PhpConsoleColor\ConsoleColor;
use JakubOnderka\PhpConsoleHighlighter\Highlighter;

require __DIR__ . '/../vendor/autoload.php';
Expand Down
14 changes: 7 additions & 7 deletions src/Highlighter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
namespace JakubOnderka\PhpConsoleHighlighter;

use JakubOnderka\PhpConsoleColor\ConsoleColor;
use PHP_Parallel_Lint\PhpConsoleColor\ConsoleColor;

class Highlighter
{
Expand Down Expand Up @@ -31,7 +31,7 @@ class Highlighter

/**
* @param ConsoleColor $color
* @throws \JakubOnderka\PhpConsoleColor\InvalidStyleException
* @throws \PHP_Parallel_Lint\PhpConsoleColor\InvalidStyleException
*/
public function __construct(ConsoleColor $color)
{
Expand All @@ -50,7 +50,7 @@ public function __construct(ConsoleColor $color)
* @param int $linesBefore
* @param int $linesAfter
* @return string
* @throws \JakubOnderka\PhpConsoleColor\InvalidStyleException
* @throws \PHP_Parallel_Lint\PhpConsoleColor\InvalidStyleException
* @throws \InvalidArgumentException
*/
public function getCodeSnippet($source, $lineNumber, $linesBefore = 2, $linesAfter = 2)
Expand All @@ -70,7 +70,7 @@ public function getCodeSnippet($source, $lineNumber, $linesBefore = 2, $linesAft
/**
* @param string $source
* @return string
* @throws \JakubOnderka\PhpConsoleColor\InvalidStyleException
* @throws \PHP_Parallel_Lint\PhpConsoleColor\InvalidStyleException
* @throws \InvalidArgumentException
*/
public function getWholeFile($source)
Expand All @@ -83,7 +83,7 @@ public function getWholeFile($source)
/**
* @param string $source
* @return string
* @throws \JakubOnderka\PhpConsoleColor\InvalidStyleException
* @throws \PHP_Parallel_Lint\PhpConsoleColor\InvalidStyleException
* @throws \InvalidArgumentException
*/
public function getWholeFileWithLineNumbers($source)
Expand Down Expand Up @@ -215,7 +215,7 @@ private function splitToLines(array $tokens)
/**
* @param array $tokenLines
* @return array
* @throws \JakubOnderka\PhpConsoleColor\InvalidStyleException
* @throws \PHP_Parallel_Lint\PhpConsoleColor\InvalidStyleException
* @throws \InvalidArgumentException
*/
private function colorLines(array $tokenLines)
Expand All @@ -241,7 +241,7 @@ private function colorLines(array $tokenLines)
* @param array $lines
* @param null|int $markLine
* @return string
* @throws \JakubOnderka\PhpConsoleColor\InvalidStyleException
* @throws \PHP_Parallel_Lint\PhpConsoleColor\InvalidStyleException
*/
private function lineNumbers(array $lines, $markLine = null)
{
Expand Down
4 changes: 2 additions & 2 deletions tests/HighlighterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ class HighlighterTest extends TestCase
protected function getConsoleColorMock()
{
$mock = method_exists($this, 'createMock')
? $this->createMock('\JakubOnderka\PhpConsoleColor\ConsoleColor')
: $this->getMock('\JakubOnderka\PhpConsoleColor\ConsoleColor');
? $this->createMock('\PHP_Parallel_Lint\PhpConsoleColor\ConsoleColor')
: $this->getMock('\PHP_Parallel_Lint\PhpConsoleColor\ConsoleColor');

$mock->expects($this->any())
->method('apply')
Expand Down