Skip to content

Conversation

hlhill
Copy link
Contributor

@hlhill hlhill commented Apr 2, 2021

No description provided.

composer.json Outdated
"easyswoole/orm": "^1.4",
"easyswoole/easyswoole": "~3.3|~3.4"
"easyswoole/easyswoole": "~3.3|~3.4",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Delete a comma

@Player626
Copy link
Collaborator

@hlhill Compress your submission into a

@@ -12,6 +12,23 @@

class DatabaseAdapterTest extends TestCase
{

public function setUp()
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Increase the return value void

@coveralls
Copy link

Pull Request Test Coverage Report for Build 711466440

  • -46 of 46 (0.0%) changed or added relevant lines in 3 files are covered.
  • 107 unchanged lines in 4 files lost coverage.
  • Overall coverage decreased (-80.6%) to 0.0%

Changes Missing Coverage Covered Lines Changed/Added Lines %
src/Config.php 0 1 0.0%
src/Enforcer.php 0 21 0.0%
src/IDE/EnforcerIDE.php 0 24 0.0%
Files with Coverage Reduction New Missed Lines %
src/Config.php 4 0%
src/Logger.php 10 0%
src/Casbin.php 15 0%
src/Adapters/DatabaseAdapter.php 78 0%
Totals Coverage Status
Change from base Build 710584379: -80.6%
Covered Lines: 0
Relevant Lines: 187

💛 - Coveralls

@coveralls
Copy link

coveralls commented Apr 2, 2021

Pull Request Test Coverage Report for Build 711466440

Warning: This coverage report may be inaccurate.

This pull request's base commit is no longer the HEAD commit of its target branch. This means it includes changes from outside the original pull request, including, potentially, unrelated coverage changes.

Details

  • 0 of 46 (0.0%) changed or added relevant lines in 3 files are covered.
  • 107 unchanged lines in 4 files lost coverage.
  • Overall coverage decreased (-80.6%) to 0.0%

Changes Missing Coverage Covered Lines Changed/Added Lines %
src/Config.php 0 1 0.0%
src/Enforcer.php 0 21 0.0%
src/IDE/EnforcerIDE.php 0 24 0.0%
Files with Coverage Reduction New Missed Lines %
src/Config.php 4 0.0%
src/Logger.php 10 0.0%
src/Casbin.php 15 0.0%
src/Adapters/DatabaseAdapter.php 78 0.0%
Totals Coverage Status
Change from base Build 710584379: -80.6%
Covered Lines: 0
Relevant Lines: 179

💛 - Coveralls

@Player626
Copy link
Collaborator

@techoner review

@Player626 Player626 requested a review from leeqvip April 2, 2021 11:27
@Player626
Copy link
Collaborator

@techoner You see what else you need to pay attention to. I have read it once and can merge it.

@hsluoyz
Copy link
Member

hsluoyz commented Apr 2, 2021

@techoner

@leeqvip
Copy link
Member

leeqvip commented Apr 4, 2021

@hlhill Please modify commit messsge, refer to: https://github.com/semantic-release/semantic-release#commit-message-format

@hsluoyz
Copy link
Member

hsluoyz commented Apr 4, 2021

@hlhill plz fix conflicts.

Comment on lines +13 to +14
"ext-swoole": ">=4.4",
"casbin/casbin": "~3.0",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

plz fix conflicts.

@@ -34,9 +34,14 @@
'host' => '127.0.0.1',
'port' => 3306,
'user' => 'root',
'password' => '',
'database' => 'easyswoole_permission',
'password' => 'root',
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Automated test failed

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Modify

phpunit.php Outdated
Comment on lines 3 to 9
defined("MYSQL_HOST") ?: define('MYSQL_HOST', '10.10.28.130');
defined("MYSQL_PORT") ?: define('MYSQL_PORT', 3306);
defined("MYSQL_USER") ?: define('MYSQL_USER', 'root');
defined("MYSQL_PASSWORD") ?: define('MYSQL_PASSWORD', 'root');
defined("MYSQL_DATABASE") ?: define('MYSQL_DATABASE', 'test');
defined("MYSQL_TIMEOUT") ?: define('MYSQL_TIMEOUT', 5);
defined("MYSQL_CHARSET") ?: define('MYSQL_CHARSET', 'utf8mb4');
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Modify

@hsluoyz
Copy link
Member

hsluoyz commented Apr 28, 2021

@hlhill remove merge commits:

image

composer.json Outdated
"easyswoole/orm": "^1.4",
"easyswoole/easyswoole": "~3.3|~3.4"
"easyswoole/easyswoole": "~3.3|~3.4",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

error

@Player626
Copy link
Collaborator

@hsluoyz @techoner direct squash and merge

@hsluoyz hsluoyz merged commit 863057d into php-casbin:master Apr 29, 2021
@hsluoyz
Copy link
Member

hsluoyz commented Apr 29, 2021

Done.

@leeqvip
Copy link
Member

leeqvip commented Nov 22, 2021

🎉 This PR is included in version 1.6.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants