diff --git a/.idea/php-test-framework.xml b/.idea/php-test-framework.xml
deleted file mode 100644
index 2164112..0000000
--- a/.idea/php-test-framework.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/php.xml b/.idea/php.xml
index 0177d3d..58b0f89 100644
--- a/.idea/php.xml
+++ b/.idea/php.xml
@@ -12,142 +12,25 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- /etc/php/8.3/cli/conf.d/10-opcache.ini, /etc/php/8.3/cli/conf.d/10-pdo.ini, /etc/php/8.3/cli/conf.d/20-calendar.ini, /etc/php/8.3/cli/conf.d/20-ctype.ini, /etc/php/8.3/cli/conf.d/20-exif.ini, /etc/php/8.3/cli/conf.d/20-ffi.ini, /etc/php/8.3/cli/conf.d/20-fileinfo.ini, /etc/php/8.3/cli/conf.d/20-ftp.ini, /etc/php/8.3/cli/conf.d/20-gettext.ini, /etc/php/8.3/cli/conf.d/20-iconv.ini, /etc/php/8.3/cli/conf.d/20-igbinary.ini, /etc/php/8.3/cli/conf.d/20-memcache.ini, /etc/php/8.3/cli/conf.d/20-phar.ini, /etc/php/8.3/cli/conf.d/20-posix.ini, /etc/php/8.3/cli/conf.d/20-readline.ini, /etc/php/8.3/cli/conf.d/20-redis.ini, /etc/php/8.3/cli/conf.d/20-shmop.ini, /etc/php/8.3/cli/conf.d/20-sockets.ini, /etc/php/8.3/cli/conf.d/20-sysvmsg.ini, /etc/php/8.3/cli/conf.d/20-sysvsem.ini, /etc/php/8.3/cli/conf.d/20-sysvshm.ini, /etc/php/8.3/cli/conf.d/20-tokenizer.ini
- /etc/php/8.3/cli/php.ini
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- /etc/php/8.1/cli/conf.d/10-opcache.ini, /etc/php/8.1/cli/conf.d/10-pdo.ini, /etc/php/8.1/cli/conf.d/15-xml.ini, /etc/php/8.1/cli/conf.d/20-calendar.ini, /etc/php/8.1/cli/conf.d/20-ctype.ini, /etc/php/8.1/cli/conf.d/20-curl.ini, /etc/php/8.1/cli/conf.d/20-dom.ini, /etc/php/8.1/cli/conf.d/20-exif.ini, /etc/php/8.1/cli/conf.d/20-ffi.ini, /etc/php/8.1/cli/conf.d/20-fileinfo.ini, /etc/php/8.1/cli/conf.d/20-ftp.ini, /etc/php/8.1/cli/conf.d/20-gd.ini, /etc/php/8.1/cli/conf.d/20-gettext.ini, /etc/php/8.1/cli/conf.d/20-iconv.ini, /etc/php/8.1/cli/conf.d/20-mbstring.ini, /etc/php/8.1/cli/conf.d/20-phar.ini, /etc/php/8.1/cli/conf.d/20-posix.ini, /etc/php/8.1/cli/conf.d/20-readline.ini, /etc/php/8.1/cli/conf.d/20-shmop.ini, /etc/php/8.1/cli/conf.d/20-simplexml.ini, /etc/php/8.1/cli/conf.d/20-sockets.ini, /etc/php/8.1/cli/conf.d/20-sysvmsg.ini, /etc/php/8.1/cli/conf.d/20-sysvsem.ini, /etc/php/8.1/cli/conf.d/20-sysvshm.ini, /etc/php/8.1/cli/conf.d/20-tokenizer.ini, /etc/php/8.1/cli/conf.d/20-xmlreader.ini, /etc/php/8.1/cli/conf.d/20-xmlwriter.ini, /etc/php/8.1/cli/conf.d/20-xsl.ini, /etc/php/8.1/cli/conf.d/20-zip.ini
- /etc/php/8.1/cli/php.ini
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -160,11 +43,9 @@
-
-
@@ -183,20 +64,18 @@
-
-
-
+
@@ -208,7 +87,6 @@
-
@@ -232,17 +110,11 @@
-
-
-
-
-
-
@@ -251,7 +123,7 @@
-
+
diff --git a/.idea/socialbox-php.iml b/.idea/socialbox-php.iml
index 2f18a64..47ac8d8 100644
--- a/.idea/socialbox-php.iml
+++ b/.idea/socialbox-php.iml
@@ -2,6 +2,9 @@
+
+
+
diff --git a/.idea/sqldialects.xml b/.idea/sqldialects.xml
index 3b3a3cb..a012e6b 100644
--- a/.idea/sqldialects.xml
+++ b/.idea/sqldialects.xml
@@ -2,5 +2,6 @@
+
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 31dd44a..424ebce 100644
--- a/Makefile
+++ b/Makefile
@@ -11,10 +11,13 @@ all: build
build:
ncc build --config=$(CONFIG) --log-level $(LOG_LEVEL)
-install:
- ncc package install --package=$(PACKAGE) --skip-dependencies --reinstall -y --log-level $(LOG_LEVEL)
+install: build
+ ncc package install --package=$(PACKAGE) --skip-dependencies --build-source --reinstall -y --log-level $(LOG_LEVEL)
+
+test: build
+ phpunit
clean:
rm -rf build
-.PHONY: all build install clean
\ No newline at end of file
+.PHONY: all build install test clean
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 81988e0..2136802 100644
--- a/composer.json
+++ b/composer.json
@@ -10,5 +10,7 @@
}
],
"require": {
+ "ext-pdo": "*",
+ "ext-openssl": "*"
}
}
\ No newline at end of file
diff --git a/project.json b/project.json
index aafd222..e7bb971 100644
--- a/project.json
+++ b/project.json
@@ -2,8 +2,11 @@
"project": {
"compiler": {
"extension": "php",
- "minimum_version": "8.0",
- "maximum_version": "8.2"
+ "minimum_version": "8.2",
+ "maximum_version": "8.0"
+ },
+ "options": {
+ "create_symlink": true
}
},
"assembly": {
@@ -15,11 +18,24 @@
"build": {
"source_path": "src/Socialbox",
"default_configuration": "release",
+ "main": "main_policy",
"define_constants": {
"ASSEMBLY_PACKAGE": "%ASSEMBLY.PACKAGE%",
"ASSEMBLY_VERSION": "%ASSEMBLY.VERSION%",
"ASSEMBLY_UID": "%ASSEMBLY.UID%"
},
+ "dependencies": [
+ {
+ "name": "com.symfony.uid",
+ "version": "latest",
+ "source": "symfony/uid=latest@packagist"
+ },
+ {
+ "name": "net.nosial.configlib",
+ "version": "latest",
+ "source": "nosial/libs.config=latest@n64"
+ }
+ ],
"configurations": [
{
"name": "release",
@@ -33,15 +49,40 @@
"define_constants": {
"DEBUG": "1"
}
- }
- ],
- "dependencies": [
+ },
{
- "name": "com.symfony.uid",
- "version": "latest",
- "source_type": "remote",
- "source": "symfony/uid=latest@packagist"
+ "name": "release_executable",
+ "build_type": "executable",
+ "output": "build/release/%ASSEMBLY.NAME%",
+ "options": {
+ "ncc_configuration": "release"
+ }
+ },
+ {
+ "name": "debug_executable",
+ "build_type": "executable",
+ "output": "build/debug/%ASSEMBLY.NAME%",
+ "options": {
+ "ncc_configuration": "debug"
+ },
+ "define_constants": {
+ "DEBUG": "1"
+ }
}
]
- }
+ },
+ "execution_policies": [
+ {
+ "name": "main_policy",
+ "runner": "php",
+ "execute": {
+ "working_directory": "%CWD%",
+ "silent": false,
+ "tty": true,
+ "timeout": null,
+ "idle_timeout": null,
+ "target": "main"
+ }
+ }
+ ]
}
\ No newline at end of file